comparison lisp/x11/x-init.el @ 149:538048ae2ab8 r20-3b1

Import from CVS: tag r20-3b1
author cvs
date Mon, 13 Aug 2007 09:36:16 +0200
parents 54cc21c15cbb
children 3d6bfa290dbd
comparison
equal deleted inserted replaced
148:f659db2a1f73 149:538048ae2ab8
177 (define-key global-map 'cut 'x-kill-primary-selection) 177 (define-key global-map 'cut 'x-kill-primary-selection)
178 178
179 (define-key global-map 'menu 'popup-mode-menu) 179 (define-key global-map 'menu 'popup-mode-menu)
180 ;;(define-key global-map '(shift menu) 'x-goto-menubar) ;NYI 180 ;;(define-key global-map '(shift menu) 'x-goto-menubar) ;NYI
181 181
182 ;; This runs after the first frame has been created (we can't
183 ;; talk to the X server before that) but before the
184 ;; site-start-file or .emacs file, so sites and users have a
185 ;; chance to override it.
186 (add-hook 'before-init-hook 'x-initialize-keyboard)
187
188 (setq post-x-win-initted t))) 182 (setq post-x-win-initted t)))
183
184
185 (when (featurep 'x)
186 (add-hook
187 'create-console-hook
188 (lambda (console)
189 (letf (((selected-console) console))
190 (when (eq 'x (console-type console))
191 (x-initialize-keyboard))))))
192
189 193
190 (defun make-frame-on-display (display &optional props) 194 (defun make-frame-on-display (display &optional props)
191 "Create a frame on the X display named DISPLAY. 195 "Create a frame on the X display named DISPLAY.
192 DISPLAY should be a standard display string such as \"unix:0\", 196 DISPLAY should be a standard display string such as \"unix:0\",
193 or nil for the display specified on the command line or in the 197 or nil for the display specified on the command line or in the