Commit 39250ec3 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(fancy-splash-screens): Use local rather than global map.

Don't use `update-menu-bindings' any more.
Get rid of assumptions about keymap representation.
parent 742c1822
2000-10-06 Stefan Monnier <monnier@cs.yale.edu>
* startup.el (fancy-splash-screens): Use local rather than global map.
Don't use `update-menu-bindings' any more.
Get rid of assumptions about keymap representation.
2000-10-06 Dave Love <fx@gnu.org> 2000-10-06 Dave Love <fx@gnu.org>
* textmodes/fill.el (sentence-end-double-space) * textmodes/fill.el (sentence-end-double-space)
...@@ -8,8 +14,7 @@ ...@@ -8,8 +14,7 @@
* net/eudc-vars.el (eudc): Add :version, :link. * net/eudc-vars.el (eudc): Add :version, :link.
* international/mule-conf.el (file-coding-system-alist): Use \', * international/mule-conf.el (file-coding-system-alist): Use \', not $.
not $.
* emacs-lisp/find-func.el (find-function-regexp): Remove spurion. * emacs-lisp/find-func.el (find-function-regexp): Remove spurion.
Fix for define-minor-mode. Fix for define-minor-mode.
...@@ -23,6 +28,21 @@ ...@@ -23,6 +28,21 @@
image-file-name-regexps. image-file-name-regexps.
(image-file-name-extensions): Add pbm. (image-file-name-extensions): Add pbm.
2000-10-06 Stefan Monnier <monnier@cs.yale.edu>
* smerge-mode.el (smerge-diff): Setup the buffer's default-directory
and add filename to the names so that diff-mode can jump to source.
* font-lock.el (font-lock-defaults-alist): Remove the TeX entries.
(tex-font-lock-keywords, tex-font-lock-keywords-2)
(tex-font-lock-keywords-1): Remove.
(font-lock-turn-on-thing-lock): Use jit-lock-register.
(font-lock-turn-off-thing-lock): Use jit-lock-unregister.
(font-lock-default-fontify-region): Expand beg..end correctly
when just following a multiline region.
(font-lock-fontify-anchored-keywords):
Include the anchor text as part of the multiline.
2000-10-06 Gerd Moellmann <gerd@gnu.org> 2000-10-06 Gerd Moellmann <gerd@gnu.org>
* loadup.el (toplevel): Load `loaddefs' before `help' because the * loadup.el (toplevel): Load `loaddefs' before `help' because the
......
...@@ -480,7 +480,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ...@@ -480,7 +480,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(run-hooks 'window-setup-hook)) (run-hooks 'window-setup-hook))
(or menubar-bindings-done (or menubar-bindings-done
(if (memq window-system '(x w32)) (if (memq window-system '(x w32))
(precompute-menubar-bindings))))))) (precompute-menubar-bindings)
))))))
;; Precompute the keyboard equivalents in the menu bar items. ;; Precompute the keyboard equivalents in the menu bar items.
(defun precompute-menubar-bindings () (defun precompute-menubar-bindings ()
...@@ -1013,23 +1014,15 @@ where FACE is a valid face specification, as it can be used with ...@@ -1013,23 +1014,15 @@ where FACE is a valid face specification, as it can be used with
"Display fancy splash screens when Emacs starts." "Display fancy splash screens when Emacs starts."
(setq fancy-splash-help-echo (startup-echo-area-message)) (setq fancy-splash-help-echo (startup-echo-area-message))
(switch-to-buffer "GNU Emacs") (switch-to-buffer "GNU Emacs")
(let ((old-global-map (current-global-map)) (let ((old-busy-cursor display-busy-cursor)
(old-busy-cursor display-busy-cursor)
(splash-buffer (current-buffer)) (splash-buffer (current-buffer))
;; Don't update menu bindings in the following. Since
;; C-x etc. are not bound in the map installed below,
;; there wouldn't be any bindings shown otherwise.
(update-menu-bindings nil)
timer) timer)
(unwind-protect (unwind-protect
(let ((map (nconc (make-sparse-keymap) (let ((map (make-sparse-keymap))
'((t . fancy-splash-default-action))))
(show-help-function nil)) (show-help-function nil))
(use-global-map map) (use-local-map map)
(use-local-map nil) (define-key map [t] 'fancy-splash-default-action)
(define-key map [mouse-movement] 'ignore) (define-key map [mouse-movement] 'ignore)
(define-key map [menu-bar] (lookup-key old-global-map [menu-bar]))
(define-key map [tool-bar] (lookup-key old-global-map [tool-bar]))
(setq cursor-type nil (setq cursor-type nil
display-busy-cursor nil display-busy-cursor nil
mode-line-format mode-line-format
...@@ -1040,7 +1033,6 @@ where FACE is a valid face specification, as it can be used with ...@@ -1040,7 +1033,6 @@ where FACE is a valid face specification, as it can be used with
(recursive-edit)) (recursive-edit))
(cancel-timer timer) (cancel-timer timer)
(remove-hook 'pre-command-hook 'fancy-splash-pre-command) (remove-hook 'pre-command-hook 'fancy-splash-pre-command)
(use-global-map old-global-map)
(setq display-busy-cursor old-busy-cursor) (setq display-busy-cursor old-busy-cursor)
(kill-buffer splash-buffer)))) (kill-buffer splash-buffer))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment