Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121

4 files changed, 17 insertions, 29 deletions

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 3fee14bf565..bd590d62f05 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -601,7 +601,7 @@ that requires a literal mode spec at compile time."
   (add-hook 'before-change-functions 'c-before-change nil t)
   (make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions 'c-after-change nil t)
-  (setq font-lock-extend-after-change-region-function
+  (set (make-local-variable 'font-lock-extend-after-change-region-function)
         'c-extend-after-change-region)) ; Currently (2008-04), only used by AWK.
 
 (defun c-setup-doc-comment-style ()
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index d9776c0c4cd..a3f3993629c 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -481,6 +481,15 @@ otherwise do not."
 
 (defconst gdb-source-file-regexp "\\(.+?\\), \\|\\([^, \n].*$\\)")
 
+(defun gdb-init-buffer ()
+  (set (make-local-variable 'gud-minor-mode)
+       (buffer-local-value 'gud-minor-mode gud-comint-buffer))
+  (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+  (when gud-tooltip-mode
+    (make-local-variable 'gdb-define-alist)
+    (gdb-create-define-alist)
+    (add-hook 'after-save-hook 'gdb-create-define-alist nil t)))
+
 (defun gdb-set-gud-minor-mode-existing-buffers ()
   "Create list of source files for current GDB session."
   (goto-char (point-min))
@@ -493,12 +502,7 @@ otherwise do not."
         (when (and buffer-file-name
                    (member (file-name-nondirectory buffer-file-name)
                            gdb-source-file-list))
-          (set (make-local-variable 'gud-minor-mode) 'gdba)
-          (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
-          (when gud-tooltip-mode
-            (make-local-variable 'gdb-define-alist)
-            (gdb-create-define-alist)
-            (add-hook 'after-save-hook 'gdb-create-define-alist nil t))))))
+          (gdb-init-buffer)))))
   (gdb-force-mode-line-update
    (propertize "ready" 'face font-lock-variable-name-face)))
 
@@ -1953,10 +1957,7 @@ static char *magick[] = {
                                    (not (string-equal file "File not found")))
                               (with-current-buffer
                                   (find-file-noselect file 'nowarn)
-                                (set (make-local-variable 'gud-minor-mode)
-                                     'gdba)
-                                (set (make-local-variable 'tool-bar-map)
-                                     gud-tool-bar-map)
+                                (gdb-init-buffer)
                                 ;; Only want one breakpoint icon at each
                                 ;; location.
                                 (save-excursion
@@ -3269,9 +3270,7 @@ Add directory to search path for source files using the GDB command, dir."))
       (throw 'file-not-found nil))
     (with-current-buffer
         (find-file-noselect (match-string 0))
-      (save-current-buffer
-        (set (make-local-variable 'gud-minor-mode) 'gdba)
-        (set (make-local-variable 'tool-bar-map) gud-tool-bar-map))
+      (gdb-init-buffer)
       ;; only want one breakpoint icon at each location
       (save-excursion
         (goto-line (string-to-number line))
@@ -3293,9 +3292,7 @@ of the current session."
                     buffer-file-name)
                   gdb-source-file-list)
           (with-current-buffer (find-buffer-visiting buffer-file-name)
-            (set (make-local-variable 'gud-minor-mode)
-                 (buffer-local-value 'gud-minor-mode gud-comint-buffer))
-            (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)))))
+            (gdb-init-buffer)))))
 
 ;;from put-image
 (defun gdb-put-string (putstring pos &optional dprop &rest sprops)
@@ -3625,13 +3622,7 @@ is set in them."
   (dolist (buffer (buffer-list))
     (with-current-buffer buffer
       (when (member buffer-file-name gdb-source-file-list)
-        (set (make-local-variable 'gud-minor-mode)
-             (buffer-local-value 'gud-minor-mode gud-comint-buffer))
-        (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
-        (when gud-tooltip-mode
-          (make-local-variable 'gdb-define-alist)
-          (gdb-create-define-alist)
-          (add-hook 'after-save-hook 'gdb-create-define-alist nil t)))))
+        (gdb-init-buffer))))
   (gdb-force-mode-line-update
    (propertize "ready" 'face font-lock-variable-name-face)))
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index dbb1aa8be99..8bfccaabb6d 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3424,10 +3424,7 @@ This function must return nil if it doesn't handle EVENT."
           (if (and (eq gud-minor-mode 'gdba)
                    (not gdb-active-process))
               (progn
-                (with-current-buffer
-                    (window-buffer (let ((mouse (mouse-position)))
-                                     (window-at (cadr mouse)
-                                                (cddr mouse))))
+                (with-current-buffer (tooltip-event-buffer event)
                   (let ((define-elt (assoc expr gdb-define-alist)))
                     (unless (null define-elt)
                       (tooltip-show
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index ea9300f851b..2bf5b74c615 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1352,7 +1352,7 @@ definition and conveniently use this command."
   (save-excursion
     (beginning-of-line)
     (cond
-     ((looking-at "^#+\\s-*")
+     ((looking-at "^[ \t]*#+\\s-*")
       ;; Found a comment.  Return nil to let normal filling take place.
       nil)