]> git.eshelyaron.com Git - emacs.git/commitdiff
(fancy-splash-screens): Use local rather than global map.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 6 Oct 2000 22:19:23 +0000 (22:19 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 6 Oct 2000 22:19:23 +0000 (22:19 +0000)
Don't use `update-menu-bindings' any more.
Get rid of assumptions about keymap representation.

lisp/ChangeLog
lisp/startup.el

index bce1366569249bdcb12062ac648641a84680877c..85acae57ef773aff765d7982c2db1e4040f5771f 100644 (file)
@@ -1,3 +1,9 @@
+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>
 
        * textmodes/fill.el (sentence-end-double-space) 
@@ -8,8 +14,7 @@
 
        * net/eudc-vars.el (eudc): Add :version, :link.
 
-       * international/mule-conf.el (file-coding-system-alist): Use \',
-       not $.
+       * international/mule-conf.el (file-coding-system-alist): Use \', not $.
 
        * emacs-lisp/find-func.el (find-function-regexp): Remove spurion.
        Fix for define-minor-mode.
        image-file-name-regexps.
        (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>
 
        * loadup.el (toplevel): Load `loaddefs' before `help' because the
index 7ce43e20898ba030d0738f7b0f597854ada1ba26..ceb5211d69770d94131c6005e1b0d0de4e342ac8 100644 (file)
@@ -480,7 +480,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
             (run-hooks 'window-setup-hook))
        (or menubar-bindings-done
            (if (memq window-system '(x w32))
-               (precompute-menubar-bindings)))))))
+               (precompute-menubar-bindings)
+             ))))))
 
 ;; Precompute the keyboard equivalents in the menu bar items.
 (defun precompute-menubar-bindings ()
@@ -1013,23 +1014,15 @@ where FACE is a valid face specification, as it can be used with
   "Display fancy splash screens when Emacs starts."
   (setq fancy-splash-help-echo (startup-echo-area-message))
   (switch-to-buffer "GNU Emacs")
-  (let ((old-global-map (current-global-map))
-       (old-busy-cursor display-busy-cursor)
+  (let ((old-busy-cursor display-busy-cursor)
        (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)
     (unwind-protect
-       (let ((map (nconc (make-sparse-keymap)
-                         '((t . fancy-splash-default-action))))
+       (let ((map (make-sparse-keymap))
              (show-help-function nil))
-         (use-global-map map)
-         (use-local-map nil)
+         (use-local-map map)
+         (define-key map [t] 'fancy-splash-default-action)
          (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
                display-busy-cursor nil
                mode-line-format
@@ -1040,7 +1033,6 @@ where FACE is a valid face specification, as it can be used with
          (recursive-edit))
       (cancel-timer timer)
       (remove-hook 'pre-command-hook 'fancy-splash-pre-command)
-      (use-global-map old-global-map)
       (setq display-busy-cursor old-busy-cursor)
       (kill-buffer splash-buffer))))