Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-263
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-264
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-265
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-99
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-100
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-555

3 files changed, 61 insertions, 66 deletions

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 4b3202c6e41..28fcb70bb8b 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -114,8 +114,6 @@ Set to \"main\" at start if gdb-show-main is t.")
 Each element has the form (VARNUM EXPRESSION NUMCHILD TYPE VALUE STATUS FP)
 where STATUS is nil (unchanged), `changed' or `out-of-scope', FP the frame
 address for root variables.")
-(defvar gdb-force-update t
- "Non-nil means that view of watch expressions will be updated in the speedbar.")
 (defvar gdb-main-file nil "Source file from which program execution begins.")
 (defvar gdb-overlay-arrow-position nil)
 (defvar gdb-server-prefix nil)
@@ -527,7 +525,6 @@ With arg, use separate IO iff arg is positive."
         gdb-current-language nil
         gdb-frame-number nil
         gdb-var-list nil
-        gdb-force-update t
         gdb-main-file nil
         gdb-first-post-prompt t
         gdb-prompting nil
@@ -1381,7 +1378,6 @@ happens to be appropriate."
       ;; FIXME: with GDB-6 on Darwin, this might very well work.
       ;; Only needed/used with speedbar/watch expressions.
       (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
-        (setq gdb-force-update t)
         (if (string-equal gdb-version "pre-6.4")
             (gdb-var-update)
           (gdb-var-update-1)))))
@@ -3166,7 +3162,9 @@ BUFFER nil or omitted means use the current buffer."
     (if (and (match-string 3) gud-overlay-arrow-position)
       (let ((buffer (marker-buffer gud-overlay-arrow-position))
             (position (marker-position gud-overlay-arrow-position)))
-        (when (and buffer (string-equal (buffer-name buffer) (match-string 3)))
+        (when (and buffer
+                   (string-equal (buffer-name buffer)
+                                 (file-name-nondirectory (match-string 3))))
           (with-current-buffer buffer
             (setq fringe-indicator-alist
                   (if (string-equal gdb-frame-number "0")
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 11259aa3965..5be88668353 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -49,7 +49,6 @@
 (defvar gdb-macro-info)
 (defvar gdb-server-prefix)
 (defvar gdb-show-changed-values)
-(defvar gdb-force-update)
 (defvar gdb-var-list)
 (defvar gdb-speedbar-auto-raise)
 (defvar tool-bar-map)
@@ -442,37 +441,55 @@ required by the caller."
              (buffer-name gud-comint-buffer))
     (let* ((minor-mode (with-current-buffer buffer gud-minor-mode))
           (window (get-buffer-window (current-buffer) 0))
+          (start (window-start window))
           (p (window-point window)))
       (cond
        ((memq minor-mode '(gdbmi gdba))
-        (when (or gdb-force-update
-                  (not (save-excursion
-                         (goto-char (point-min))
-                         (looking-at "Watch Expressions:"))))
-          (erase-buffer)
-          (insert "Watch Expressions:\n")
-          (if gdb-speedbar-auto-raise
-              (raise-frame speedbar-frame))
-          (let ((var-list gdb-var-list) parent)
-            (while var-list
-              (let* (char (depth 0) (start 0) (var (car var-list))
-                          (varnum (car var)) (expr (nth 1 var))
-                          (type (nth 3 var)) (value (nth 4 var))
-                          (status (nth 5 var)))
-                (put-text-property
-                 0 (length expr) 'face font-lock-variable-name-face expr)
-                (put-text-property
-                 0 (length type) 'face font-lock-type-face type)
-                (while (string-match "\\." varnum start)
-                  (setq depth (1+ depth)
-                        start (1+ (match-beginning 0))))
-                (if (eq depth 0) (setq parent nil))
-                (if (or (equal (nth 2 var) "0")
-                        (and (equal (nth 2 var) "1")
-                             (string-match "char \\*$" type)))
+        (erase-buffer)
+        (insert "Watch Expressions:\n")
+        (if gdb-speedbar-auto-raise
+            (raise-frame speedbar-frame))
+        (let ((var-list gdb-var-list) parent)
+          (while var-list
+            (let* (char (depth 0) (start 0) (var (car var-list))
+                        (varnum (car var)) (expr (nth 1 var))
+                        (type (nth 3 var)) (value (nth 4 var))
+                        (status (nth 5 var)))
+              (put-text-property
+               0 (length expr) 'face font-lock-variable-name-face expr)
+              (put-text-property
+               0 (length type) 'face font-lock-type-face type)
+              (while (string-match "\\." varnum start)
+                (setq depth (1+ depth)
+                      start (1+ (match-beginning 0))))
+              (if (eq depth 0) (setq parent nil))
+              (if (or (equal (nth 2 var) "0")
+                      (and (equal (nth 2 var) "1")
+                           (string-match "char \\*$" type)))
+                  (speedbar-make-tag-line
+                   'bracket ?? nil nil
+                   (concat expr "\t" value)
+                   (if (or parent (eq status 'out-of-scope))
+                       nil 'gdb-edit-value)
+                   nil
+                   (if gdb-show-changed-values
+                       (or parent (case status
+                                    (changed 'font-lock-warning-face)
+                                    (out-of-scope 'shadow)
+                                    (t t)))
+                     t)
+                   depth)
+                (if (eq status 'out-of-scope) (setq parent 'shadow))
+                (if (and (nth 1 var-list)
+                         (string-match (concat varnum "\\.")
+                                       (car (nth 1 var-list))))
+                    (setq char ?-)
+                  (setq char ?+))
+                (if (string-match "\\*$" type)
                     (speedbar-make-tag-line
-                     'bracket ?? nil nil
-                     (concat expr "\t" value)
+                     'bracket char
+                     'gdb-speedbar-expand-node varnum
+                     (concat expr "\t" type "\t" value)
                      (if (or parent (eq status 'out-of-scope))
                          nil 'gdb-edit-value)
                      nil
@@ -483,37 +500,15 @@ required by the caller."
                                       (t t)))
                        t)
                      depth)
-                  (if (eq status 'out-of-scope) (setq parent 'shadow))
-                  (if (and (nth 1 var-list)
-                           (string-match (concat varnum "\\.")
-                                         (car (nth 1 var-list))))
-                      (setq char ?-)
-                    (setq char ?+))
-                  (if (string-match "\\*$" type)
-                      (speedbar-make-tag-line
-                       'bracket char
-                       'gdb-speedbar-expand-node varnum
-                       (concat expr "\t" type "\t" value)
-                       (if (or parent (eq status 'out-of-scope))
-                         nil 'gdb-edit-value)
-                       nil
-                       (if gdb-show-changed-values
-                           (or parent (case status
-                                            (changed 'font-lock-warning-face)
-                                            (out-of-scope 'shadow)
-                                            (t t)))
-                         t)
-                       depth)
-                    (speedbar-make-tag-line
-                     'bracket char
-                     'gdb-speedbar-expand-node varnum
-                     (concat expr "\t" type)
-                     nil nil
-                     (if (and (or parent status) gdb-show-changed-values)
-                         'shadow t)
-                     depth))))
-              (setq var-list (cdr var-list))))
-          (setq gdb-force-update nil)))
+                  (speedbar-make-tag-line
+                   'bracket char
+                   'gdb-speedbar-expand-node varnum
+                   (concat expr "\t" type)
+                   nil nil
+                   (if (and (or parent status) gdb-show-changed-values)
+                       'shadow t)
+                   depth))))
+            (setq var-list (cdr var-list)))))
        (t (unless (and (save-excursion
                          (goto-char (point-min))
                          (looking-at "Current Stack:"))
@@ -544,6 +539,7 @@ required by the caller."
                        (t (error "Should never be here")))
                  frame t))))
             (setq gud-last-speedbar-stackframe gud-last-last-frame))))
+      (set-window-start window start)
       (set-window-point window p))))
 
 
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index e92bb1053a6..950e0cba06f 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -923,8 +923,9 @@ Returns new value of point in all cases."
   (or arg (setq arg 1))
   (if (< arg 0) (forward-char 1))
   (and (/= arg 0)
-       (re-search-backward "^\\s(\\|^\\s-*sub\\b[^{]+{\\|^\\s-*format\\b[^=]*=\\|^\\."
-                           nil 'move arg)
+       (re-search-backward
+        "^\\s(\\|^\\s-*sub\\b[ \t\n]*\\_<[^{]+{\\|^\\s-*format\\b[^=]*=\\|^\\."
+        nil 'move arg)
        (goto-char (1- (match-end 0))))
   (point))