Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294

20 files changed, 292 insertions, 122 deletions

diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 01f1c86618c..9f6e70dcce5 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -840,7 +840,8 @@ Do not change."
 (defface antlr-keyword
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-keyword-face)))
   "ANTLR keywords."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -850,7 +851,8 @@ Do not change."
 (defface antlr-syntax
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "black" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-constant-face)))
   "ANTLR syntax symbols like :, |, (, ), ...."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -860,7 +862,8 @@ Do not change."
 (defface antlr-ruledef
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-function-name-face)))
   "ANTLR rule references (definition)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -870,7 +873,8 @@ Do not change."
 (defface antlr-tokendef
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "blue" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-function-name-face)))
   "ANTLR token references (definition)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -878,7 +882,8 @@ Do not change."
 
 (defvar antlr-ruleref-face 'antlr-ruleref)
 (defface antlr-ruleref
-  '((((class color) (background light)) (:foreground "blue4")))
+  '((((class color) (background light)) (:foreground "blue4"))
+    (t :inherit font-lock-type-face))
   "ANTLR rule references (usage)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -886,7 +891,8 @@ Do not change."
 
 (defvar antlr-tokenref-face 'antlr-tokenref)
 (defface antlr-tokenref
-  '((((class color) (background light)) (:foreground "orange4")))
+  '((((class color) (background light)) (:foreground "orange4"))
+    (t :inherit font-lock-type-face))
   "ANTLR token references (usage)."
   :group 'antlr)
 ;; backward-compatibility alias
@@ -896,7 +902,8 @@ Do not change."
 (defface antlr-literal
   (cond-emacs-xemacs
    '((((class color) (background light))
-      (:foreground "brown4" :EMACS :weight bold :XEMACS :bold t))))
+      (:foreground "brown4" :EMACS :weight bold :XEMACS :bold t))
+     (t :inherit font-lock-string-face)))
   "ANTLR special literal tokens.
 It is used to highlight strings matched by the first regexp group of
 `antlr-font-lock-literal-regexp'."
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index a019f598918..7666da75f9b 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -604,7 +604,7 @@ comment at the start of cc-engine.el for more info."
   ;;         (e.g. if).
   ;;
   ;;
-  ;; The following diagram briefly outlines the PDA.  
+  ;; The following diagram briefly outlines the PDA.
   ;;
   ;; Common state:
   ;;   "else": Push state, goto state `else'.
@@ -1079,7 +1079,7 @@ single `?' is found, then `c-maybe-labelp' is cleared.
 
 For AWK, a statement which is terminated by an EOL (not a \; or a }) is
 regarded as having a \"virtual semicolon\" immediately after the last token on
-the line.  If this virtual semicolon is _at_ from, the function recognises it.
+the line.  If this virtual semicolon is _at_ from, the function recognizes it.
 
 Note that this function might do hidden buffer changes.  See the
 comment at the start of cc-engine.el for more info."
@@ -1916,7 +1916,7 @@ comment at the start of cc-engine.el for more info."
 (defun c-partial-ws-p (beg end)
   ;; Is the region (beg end) WS, and is there WS (or BOB/EOB) next to the
   ;; region?  This is a "heuristic" function.  .....
-  ;; 
+  ;;
   ;; The motivation for the second bit is to check whether removing this
   ;; region would coalesce two symbols.
   ;;
@@ -3291,7 +3291,7 @@ comment at the start of cc-engine.el for more info."
 ;; The workaround for this is for the AWK Mode initialisation to switch the
 ;; defalias for c-in-literal to c-slow-in-literal.  This will slow down other
 ;; cc-modes in Xemacs whenever an awk-buffer has been initialised.
-;; 
+;;
 ;; (Alan Mackenzie, 2003/4/30).
 
 (defun c-fast-in-literal (&optional lim detect-cpp)
@@ -3406,7 +3406,7 @@ comment at the start of cc-engine.el for more info."
         (if (and (consp range) (progn
                                  (goto-char (car range))
                                  (looking-at c-line-comment-starter)))
-            (let ((col (current-column)) 
+            (let ((col (current-column))
                   (beg (point))
                   (bopl (c-point 'bopl))
                   (end (cdr range)))
@@ -4045,7 +4045,7 @@ comment at the start of cc-engine.el for more info."
   ;; example, this happens to "foo" when "foo \n bar();" becomes
   ;; "foo(); \n bar();".  Such stale types, if not removed, foul up
   ;; the fontification.
-  ;; 
+  ;;
   ;; Have we, perhaps, added non-ws characters to the front/back of a found
   ;; type?
   (when (> end beg)
@@ -4064,7 +4064,7 @@ comment at the start of cc-engine.el for more info."
                         (c-beginning-of-current-token)))
             (c-unfind-type (buffer-substring-no-properties
                             (point) beg))))))
-            
+
   (if c-maybe-stale-found-type ; e.g. (c-decl-id-start "foo" 97 107 " (* ooka) " "o")
       (cond
        ;; Changing the amount of (already existing) whitespace - don't do anything.
@@ -5929,7 +5929,7 @@ comment at the start of cc-engine.el for more info."
         macro-start                     ; if we're in one.
         label-type)
     (cond
-     ;; "case" or "default" (Doesn't apply to AWK). 
+     ;; "case" or "default" (Doesn't apply to AWK).
      ((looking-at c-label-kwds-regexp)
       (let ((kwd-end (match-end 1)))
         ;; Record only the keyword itself for fontification, since in
@@ -6048,7 +6048,7 @@ comment at the start of cc-engine.el for more info."
                          (c-forward-label nil pte start))))))))))
 
            ;; Point is still at the beginning of the possible label construct.
-           ;; 
+           ;;
            ;; Check that the next nonsymbol token is ":", or that we're in one
            ;; of QT's "slots" declarations.  Allow '(' for the sake of macro
            ;; arguments.  FIXME: Should build this regexp from the language
@@ -6074,7 +6074,7 @@ comment at the start of cc-engine.el for more info."
                      (and (c-major-mode-is 'c++-mode)
                           (string-match
                            "\\(p\\(r\\(ivate\\|otected\\)\\|ublic\\)\\|more\\)\\>"
-                           (buffer-substring start (point)))))  
+                           (buffer-substring start (point)))))
                (c-forward-syntactic-ws limit)
                (cond
                 ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon.
@@ -7238,7 +7238,7 @@ comment at the start of cc-engine.el for more info."
   ;; needed with further syntax elements of the types `substatement',
   ;; `inexpr-statement', `arglist-cont-nonempty', `statement-block-intro', and
   ;; `defun-block-intro'.
-  ;; 
+  ;;
   ;; Do the generic processing to anchor the given syntax symbol on
   ;; the preceding statement: Skip over any labels and containing
   ;; statements on the same line, and then search backward until we
@@ -7424,7 +7424,7 @@ comment at the start of cc-engine.el for more info."
                                  c-other-decl-block-key-in-symbols-alist))
                      (max (c-point 'boi paren-pos) (point))))
                    (t (c-add-syntax 'defun-block-intro nil))))
-                             
+
                  (c-add-syntax 'statement-block-intro nil)))
 
           (if (= paren-pos boi)
@@ -8264,7 +8264,7 @@ comment at the start of cc-engine.el for more info."
                  'statement-cont)
                nil nil containing-sexp paren-state))
              ))
-           
+
            ;; CASE 5F: Close of a non-class declaration level block.
            ((and (eq char-after-ip ?})
                  (c-keyword-member containing-decl-kwd
diff --git a/lisp/progmodes/cc-subword.el b/lisp/progmodes/cc-subword.el
index 68ecd3a0515..d3e613fa254 100644
--- a/lisp/progmodes/cc-subword.el
+++ b/lisp/progmodes/cc-subword.el
@@ -123,6 +123,8 @@ telling us which (X)Emacs version you're using."
       map)
     "Keymap used in command `c-subword-mode' minor mode.")
 
+  ;; Produces compiler warning about make-variable-buffer-local not
+  ;; being called at toplevel (due to fboundp test).
   (define-minor-mode c-subword-mode
     "Mode enabling subword movement and editing keys.
 In spite of GNU Coding Standards, it is popular to name a symbol by
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3de5b7eeb7e..b4148c59b49 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -339,6 +339,57 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
      nil 2 nil 2 nil
      (0 'default t)
      (1 compilation-error-face prepend) (2 compilation-line-face prepend))
+
+    (compilation-perl--Pod::Checker
+     ;; podchecker error messages, per Pod::Checker.
+     ;; The style is from the Pod::Checker::poderror() function, eg.
+     ;; *** ERROR: Spurious text after =cut at line 193 in file foo.pm
+     ;;
+     ;; Plus end_pod() can give "at line EOF" instead of a
+     ;; number, so for that match "on line N" which is the
+     ;; originating spot, eg.
+     ;; *** ERROR: =over on line 37 without closing =back at line EOF in file bar.pm
+     ;;
+     ;; Plus command() can give both "on line N" and "at line N";
+     ;; the latter is desired and is matched because the .* is
+     ;; greedy.
+     ;; *** ERROR: =over on line 1 without closing =back (at head1) at line 3 in file x.pod
+     ;;
+     "^\\*\\*\\* \\(?:ERROR\\|\\(WARNING\\)\\).* \\(?:at\\|on\\) line \
+\\([0-9]+\\) \\(?:.* \\)?in file \\([^ \t\n]+\\)"
+     3 2 nil (1))
+    (compilation-perl--Test
+     ;; perl Test module error messages.
+     ;; Style per the ok() function "$context", eg.
+     ;; # Failed test 1 in foo.t at line 6
+     ;;
+     "^# Failed test [0-9]+ in \\([^ \t\r\n]+\\) at line \\([0-9]+\\)"
+     1 2)
+    (compilation-perl--Test::Harness
+     ;; perl Test::Harness output, eg.
+     ;; NOK 1# Test 1 got: "1234" (t/foo.t at line 46)
+     ;;
+     ;; Test::Harness is slightly designed for tty output, since
+     ;; it prints CRs to overwrite progress messages, but if you
+     ;; run it in with M-x compile this pattern can at least step
+     ;; through the failures.
+     ;;
+     "^.*NOK.* \\([^ \t\r\n]+\\) at line \\([0-9]+\\)"
+     1 2)
+    (compilation-weblint
+     ;; The style comes from HTML::Lint::Error::as_string(), eg.
+     ;; index.html (13:1) Unknown element <fdjsk>
+     ;;
+     ;; The pattern only matches filenames without spaces, since that
+     ;; should be usual and should help reduce the chance of a false
+     ;; match of a message from some unrelated program.
+     ;;
+     ;; This message style is quite close to the "ibm" entry which is
+     ;; for IBM C, though that ibm bit doesn't put a space after the
+     ;; filename.
+     ;;
+     "^\\([^ \t\r\n(]+\\) (\\([0-9]+\\):\\([0-9]+\\)) "
+     1 2 3)
     )
   "Alist of values for `compilation-error-regexp-alist'.")
 
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 13f1e0c24b8..4a397a9d012 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1510,6 +1510,8 @@ the last)."
      2 3))
   "Alist that specifies how to match errors in perl output.")
 
+(defvar compilation-error-regexp-alist)
+
 ;;;###autoload
 (defun cperl-mode ()
   "Major mode for editing Perl code.
@@ -1790,9 +1792,11 @@ or as help on variables `cperl-tips', `cperl-problems',
   (set 'vc-sccs-header cperl-vc-sccs-header)
   ;; This one is obsolete...
   (make-local-variable 'vc-header-alist)
-  (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning
-                            `((SCCS ,(car cperl-vc-sccs-header))
-                              (RCS ,(car cperl-vc-rcs-header)))))
+  (with-no-warnings
+   (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning
+                             `((SCCS ,(car cperl-vc-sccs-header))
+                               (RCS ,(car cperl-vc-rcs-header)))))
+   )
   (cond ((boundp 'compilation-error-regexp-alist-alist);; xemacs 20.x
          (make-local-variable 'compilation-error-regexp-alist-alist)
          (set 'compilation-error-regexp-alist-alist
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 6a3e9e82d6e..4546880cca5 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -2201,6 +2201,7 @@ otherwise return nil."
           ()
         (equal start (match-end 0))))))
 
+(declare-function imenu-default-create-index-function "imenu" ())
 
 ;;;-------------------------------------------------------------------------
 (defun dcl-imenu-create-index-function ()
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 5538bd8984a..1e144282de5 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1268,10 +1268,9 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
 (defun flymake-goto-file-and-line (file line)
   "Try to get buffer for FILE and goto line LINE in it."
   (if (not (file-exists-p file))
-      (flymake-log 1 "file %s does not exists" file)
-    (progn
-      (find-file file)
-      (goto-line line))))
+      (flymake-log 1 "File %s does not exist" file)
+    (find-file file)
+    (goto-line line)))
 
 ;; flymake minor mode declarations
 (defvar flymake-mode-line nil)
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 43cb61cba6b..1954319269d 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -908,6 +908,8 @@ affects all Fortran buffers, and also the default."
   "Fortran mode adds this to `hack-local-variables-hook'."
   (fortran-line-length fortran-line-length))
 
+(declare-function gud-find-c-expr "gud.el" nil)
+
 (defun fortran-gud-find-expr ()
   ;; Consider \n as punctuation (end of expression).
   (with-syntax-table fortran-gud-syntax-table
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 0d1a4b05d65..32db8850b66 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -43,12 +43,22 @@
 ;; section in the GDB info manual.
 
 ;; GDB developers plan to make the annotation interface obsolete.  A new
-;; interface called GDB/MI (machine interface) has been designed to replace
-;; it.  Some GDB/MI commands are used in this file through the CLI command
-;; 'interpreter mi <mi-command>'.  A file called gdb-mi.el is included with
-;; GDB (6.2 onwards) that uses GDB/MI as the primary interface to GDB.  It is
-;; still under development and is part of a process to migrate Emacs from
-;; annotations to GDB/MI.
+;; interface called GDB/MI (machine interface) has been designed to replace it.
+;; Some GDB/MI commands are used in this file through the CLI command
+;; 'interpreter mi <mi-command>'.  To help with the process of fully migrating
+;; Emacs from annotations to GDB/MI, there is an experimental package called
+;; gdb-mi in the Emacs Lisp Package Archive ("http://tromey.com/elpa/").  It
+;; comprises of modified gud.el and a file called gdb-mi.el which replaces
+;; gdb-ui.el.  When installed, this overrides the current files and invoking
+;; M-x gdb will use GDB/MI directly (starts with "gdb -i=mi").  When deleted
+;; ('d' followed by 'x' in Package Menu mode), the files are deleted and old
+;; functionality restored.  This provides a convenient way to review the
+;; current status/contribute to its improvement.  For someone who just wants to
+;; use GDB, however, the current mode in Emacs 22 is a much better option.
+;; There is also a file, also called gdb-mi.el, a version of which is included
+;; the GDB distribution.  This will probably only work with versions
+;; distributed with GDB 6.5 or later.  Unlike the version in ELPA it works on
+;; top of gdb-ui.el and you can only start it with M-x gdbmi.
 
 ;; This mode SHOULD WORK WITH GDB 5.0 or later but you will NEED AT LEAST
 ;; GDB 6.0 to use watch expressions.  It works best with GDB 6.4 or later
@@ -69,25 +79,13 @@
 
 ;;; Known Bugs:
 
-;; 1) Strings that are watched don't update in the speedbar when their
-;;    contents change unless the first character changes.
-;; 2) Cannot handle multiple debug sessions.
-;; 3) M-x gdb doesn't work with "run" command in .gdbinit, use M-x gdba instead.
-;; 4) M-x gdb doesn't work if the corefile is specified in the command in the
-;;    minibuffer, use M-x gdba instead (or specify the core in the GUD buffer).
-;; 5) If you wish to call procedures from your program in GDB
+;; 1) Cannot handle multiple debug sessions.
+;; 2) If you wish to call procedures from your program in GDB
 ;;    e.g "call myproc ()", "p mysquare (5)" then use level 2 annotations
 ;;    "gdb --annotate=2 myprog" to keep source buffer/selected frame fixed.
-;; 6) After detaching from a process, clicking on the "GO" icon on toolbar
+;; 3) After detaching from a process, clicking on the "GO" icon on toolbar
 ;;    (gud-go) sends "continue" to GDB (should be "run").
 
-;;; Problems with watch expressions, GDB/MI:
-
-;; 1) They go out of scope when the inferior is re-run.
-;; 2) -stack-list-locals has a type field but also prints type in values field.
-;; 3) VARNUM increments even when variable object is not created
-;;    (maybe trivial).
-
 ;;; TODO:
 
 ;; 1) Use MI command -data-read-memory for memory window.
@@ -138,6 +136,7 @@ Emacs can't find.")
 (defvar gdb-frame-begin nil
   "Non-nil when GDB generates frame-begin annotation.")
 (defvar gdb-printing t)
+(defvar gdb-parent-bptno-enabled nil)
 
 (defvar gdb-buffer-type nil
   "One of the symbols bound in `gdb-buffer-rules'.")
@@ -222,7 +221,6 @@ handlers.")
 The directory containing FILE becomes the initial working
 directory and source-file directory for your debugger.
 
-
 If `gdb-many-windows' is nil (the default value) then gdb just
 pops up the GUD buffer unless `gdb-show-main' is t.  In this case
 it starts with two windows: one displaying the GUD buffer and the
@@ -1860,7 +1858,7 @@ static char *magick[] = {
   :group 'gud)
 
 (defconst gdb-breakpoint-regexp
-  "\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\s-+\\(.\\)\\s-+")
+  "\\(?:\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\|\\([0-9]+\\.[0-9]+\\)\\)\\s-+\\(.\\)\\s-+")
 
 ;; Put breakpoint icons in relevant margins (even those set in the GUD buffer).
 (defun gdb-info-breakpoints-custom ()
@@ -1879,10 +1877,12 @@ static char *magick[] = {
           (forward-line 1)
           (if (looking-at gdb-breakpoint-regexp)
               (progn
-                (setq bptno (match-string 1))
-                (setq flag (char-after (match-beginning 2)))
+                (setq bptno (or (match-string 1) (match-string 2)))
+                (setq flag (char-after (match-beginning 3)))
+                (if (match-string 1)
+                    (setq gdb-parent-bptno-enabled (eq flag ?y)))
                 (add-text-properties
-                 (match-beginning 2) (match-end 2)
+                 (match-beginning 3) (match-end 3)
                  (if (eq flag ?y)
                      '(face font-lock-warning-face)
                    '(face font-lock-type-face)))
@@ -1938,6 +1938,9 @@ static char *magick[] = {
           (end-of-line))))))
   (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
 
+(declare-function gud-remove "gdb-ui" t t) ; gud-def
+(declare-function gud-break  "gdb-ui" t t) ; gud-def
+
 (defun gdb-mouse-set-clear-breakpoint (event)
   "Set/clear breakpoint in left fringe/margin with mouse click."
   (interactive "e")
@@ -1963,17 +1966,18 @@ static char *magick[] = {
           (save-excursion
             (goto-char (posn-point posn))
             (if (posn-object posn)
-                (gdb-enqueue-input
-                 (list
-                  (let ((bptno (get-text-property
-                                0 'gdb-bptno (car (posn-string posn)))))
+                (let* ((bptno (get-text-property
+                               0 'gdb-bptno (car (posn-string posn)))))
+                  (string-match "\\([0-9+]\\)*" bptno)
+                  (gdb-enqueue-input
+                   (list
                     (concat gdb-server-prefix
                             (if (get-text-property
                                  0 'gdb-enabled (car (posn-string posn)))
                                 "disable "
                               "enable ")
-                            bptno "\n"))
-                  'ignore))))))))
+                            (match-string 1 bptno) "\n")
+                   'ignore)))))))))
 
 (defun gdb-mouse-toggle-breakpoint-fringe (event)
   "Enable/disable breakpoint in left fringe with mouse click."
@@ -1991,14 +1995,16 @@ static char *magick[] = {
             (when (overlay-get overlay 'put-break)
               (setq obj (overlay-get overlay 'before-string))))
           (when (stringp obj)
-            (gdb-enqueue-input
-             (list
-              (concat gdb-server-prefix
-               (if (get-text-property 0 'gdb-enabled obj)
-                   "disable "
-                 "enable ")
-               (get-text-property 0 'gdb-bptno obj) "\n")
-              'ignore))))))))
+            (let* ((bptno (get-text-property 0 'gdb-bptno obj)))
+              (string-match "\\([0-9+]\\)*" bptno)
+              (gdb-enqueue-input
+               (list
+                (concat gdb-server-prefix
+                        (if (get-text-property 0 'gdb-enabled obj)
+                            "disable "
+                          "enable ")
+                        (match-string 1 bptno) "\n")
+                'ignore)))))))))
 
 (defun gdb-breakpoints-buffer-name ()
   (with-current-buffer gud-comint-buffer
@@ -2064,21 +2070,25 @@ static char *magick[] = {
         (gdb-enqueue-input
          (list
           (concat gdb-server-prefix
-                  (if (eq ?y (char-after (match-beginning 2)))
+                  (if (eq ?y (char-after (match-beginning 3)))
                       "disable "
                     "enable ")
-                  (match-string 1) "\n") 'ignore))
+                  (or (match-string 1) (match-string 2)) "\n") 'ignore))
       (error "Not recognized as break/watchpoint line"))))
 
 (defun gdb-delete-breakpoint ()
   "Delete the breakpoint at current line."
   (interactive)
-  (beginning-of-line 1)
-  (if (looking-at gdb-breakpoint-regexp)
-      (gdb-enqueue-input
-       (list
-        (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))
-    (error "Not recognized as break/watchpoint line")))
+  (save-excursion
+    (beginning-of-line 1)
+    (if (looking-at gdb-breakpoint-regexp)
+        (if (match-string 1)
+            (gdb-enqueue-input
+             (list
+              (concat gdb-server-prefix "delete " (match-string 1) "\n")
+              'ignore))
+          (message-box "This breakpoint cannot be deleted on its own."))
+      (error "Not recognized as break/watchpoint line"))))
 
 (defun gdb-goto-breakpoint (&optional event)
   "Display the breakpoint location specified at current line."
@@ -2086,7 +2096,7 @@ static char *magick[] = {
   (if event (posn-set-point (event-end event)))
   (save-excursion
     (beginning-of-line 1)
-    (if (looking-at "\\([0-9]+\\) .+ in .+ at\\s-+\\(\\S-+\\):\\([0-9]+\\)")
+    (if (looking-at "\\([0-9]+\\.?[0-9]*\\) .+ in .+ at\\s-+\\(\\S-+\\):\\([0-9]+\\)")
         (let ((bptno (match-string 1))
               (file  (match-string 2))
               (line  (match-string 3)))
@@ -3156,6 +3166,8 @@ BUFFER nil or omitted means use the current buffer."
           (delete-overlay overlay))))
 
 (defun gdb-put-breakpoint-icon (enabled bptno)
+  (if (string-match "[0-9+]+\\." bptno)
+      (setq enabled gdb-parent-bptno-enabled))
   (let ((start (- (line-beginning-position) 1))
         (end (+ (line-end-position) 1))
         (putstring (if enabled "B" "b"))
@@ -3215,8 +3227,8 @@ BUFFER nil or omitted means use the current buffer."
           (setq left-margin-width 2)
           (let ((window (get-buffer-window (current-buffer) 0)))
             (if window
-              (set-window-margins
-               window left-margin-width right-margin-width)))))
+                (set-window-margins
+                 window left-margin-width right-margin-width)))))
       (gdb-put-string
        (propertize putstring
                    'face (if enabled 'breakpoint-enabled 'breakpoint-disabled))
@@ -3286,18 +3298,16 @@ BUFFER nil or omitted means use the current buffer."
       (goto-char (point-min))
       (while (< (point) (- (point-max) 1))
         (forward-line 1)
-        (if (looking-at "[^\t].*?breakpoint")
-            (progn
-              (looking-at
-            "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+0x0*\\(\\S-+\\)")
-              (setq bptno (match-string 1))
-              (setq flag (char-after (match-beginning 2)))
-              (setq address (match-string 3))
-              (with-current-buffer buffer
-                (save-excursion
-                  (goto-char (point-min))
-                  (if (search-forward address nil t)
-                      (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))))
+        (when (looking-at
+               "\\([0-9]+\\.?[0-9]*\\).*?\\s-+\\(.\\)\\s-+0x0*\\(\\S-+\\)")
+          (setq bptno (match-string 1))
+          (setq flag (char-after (match-beginning 2)))
+          (setq address (match-string 3))
+          (with-current-buffer buffer
+            (save-excursion
+              (goto-char (point-min))
+              (if (search-forward address nil t)
+                  (gdb-put-breakpoint-icon (eq flag ?y) bptno)))))))
     (if (not (equal gdb-pc-address "main"))
         (with-current-buffer buffer
           (set-window-point (get-buffer-window buffer 0) pos)))))
@@ -3458,7 +3468,7 @@ is set in them."
   (gdb-force-mode-line-update
    (propertize "ready" 'face font-lock-variable-name-face)))
 
-; Uses "-var-list-children --all-values".  Needs GDB 6.1 onwards.
+; Uses "-var-list-children --all-values".  Needs GDB 6.4 onwards.
 (defun gdb-var-list-children-1 (varnum)
   (gdb-enqueue-input
    (list
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 091735ee09d..f811fce6e7f 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -333,6 +333,12 @@ This variable's value takes effect when `grep-compute-defaults' is called.")
 This variable's value takes effect when `grep-compute-defaults' is called.")
 
 ;;;###autoload
+(defvar xargs-program "xargs"
+  "The default xargs program for `grep-find-command'.
+See `grep-find-use-xargs'.
+This variable's value takes effect when `grep-compute-defaults' is called.")
+
+;;;###autoload
 (defvar grep-find-use-xargs nil
   "Non-nil means that `grep-find' uses the `xargs' utility by default.
 If `exec', use `find -exec'.
@@ -365,11 +371,16 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
   (unless (or (not grep-highlight-matches) (eq grep-highlight-matches t))
     (grep-compute-defaults))
   (when (eq grep-highlight-matches t)
-    ;; Modify `process-environment' locally bound in `compilation-start'
-    (setenv "GREP_OPTIONS" (concat (getenv "GREP_OPTIONS") " --color=always"))
-    ;; for GNU grep 2.5.1
+    ;; `setenv' modifies `process-environment' let-bound in `compilation-start'
+    ;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
+    (setenv "TERM" "emacs-grep")
+    ;; `--color=auto' emits escape sequences on a tty rather than on a pipe,
+    ;; thus allowing to use multiple grep filters on the command line
+    ;; and to output escape sequences only on the final grep output
+    (setenv "GREP_OPTIONS" (concat (getenv "GREP_OPTIONS") " --color=auto"))
+    ;; GREP_COLOR is used in GNU grep 2.5.1, but deprecated in later versions
     (setenv "GREP_COLOR" "01;31")
-    ;; for GNU grep 2.5.1-cvs
+    ;; GREP_COLORS is used in GNU grep 2.5.2 and later versions
     (setenv "GREP_COLORS" "mt=01;31:fn=:ln=:bn=:se=:ml=:cx=:ne"))
   (set (make-local-variable 'compilation-exit-message-function)
        (lambda (status code msg)
@@ -475,15 +486,15 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
                 (cond
                  ((and
                    (grep-probe find-program `(nil nil nil ,null-device "-print0"))
-                   (grep-probe "xargs" `(nil nil nil "-0" "-e" "echo")))
+                   (grep-probe xargs-program `(nil nil nil "-0" "-e" "echo")))
                   'gnu)
                  (t
                   'exec))))
         (unless grep-find-command
           (setq grep-find-command
                 (cond ((eq grep-find-use-xargs 'gnu)
-                       (format "%s . -type f -print0 | xargs -0 -e %s"
-                               find-program grep-command))
+                       (format "%s . -type f -print0 | %s -0 -e %s"
+                               find-program xargs-program grep-command))
                       ((eq grep-find-use-xargs 'exec)
                        (let ((cmd0 (format "%s . -type f -exec %s"
                                            find-program grep-command)))
@@ -493,22 +504,22 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
                                   (shell-quote-argument ";"))
                           (1+ (length cmd0)))))
                       (t
-                       (format "%s . -type f -print | xargs %s"
-                               find-program grep-command)))))
+                       (format "%s . -type f -print | %s %s"
+                               find-program xargs-program grep-command)))))
         (unless grep-find-template
           (setq grep-find-template
                 (let ((gcmd (format "%s <C> %s <R>"
                                     grep-program grep-options)))
                   (cond ((eq grep-find-use-xargs 'gnu)
-                         (format "%s . <X> -type f <F> -print0 | xargs -0 -e %s"
-                                 find-program gcmd))
+                         (format "%s . <X> -type f <F> -print0 | %s -0 -e %s"
+                                 find-program xargs-program gcmd))
                         ((eq grep-find-use-xargs 'exec)
                          (format "%s . <X> -type f <F> -exec %s {} %s %s"
                                  find-program gcmd null-device
                                  (shell-quote-argument ";")))
                         (t
-                         (format "%s . <X> -type f <F> -print | xargs %s"
-                                 find-program gcmd))))))))
+                         (format "%s . <X> -type f <F> -print | %s %s"
+                                 find-program xargs-program gcmd))))))))
     (unless (or (not grep-highlight-matches) (eq grep-highlight-matches t))
       (setq grep-highlight-matches
             (with-temp-buffer
@@ -543,7 +554,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
       ""))
 
 (defun grep-default-command ()
-  "Compute the default grep command for C-u M-x grep to offer."
+  "Compute the default grep command for \\[universal-argument] \\[grep] to offer."
   (let ((tag-default (shell-quote-argument (grep-tag-default)))
         ;; This a regexp to match single shell arguments.
         ;; Could someone please add comments explaining it?
@@ -596,19 +607,19 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
   "Run grep, with user-specified args, and collect output in a buffer.
 While grep runs asynchronously, you can use \\[next-error] (M-x next-error),
 or \\<grep-mode-map>\\[compile-goto-error] in the grep \
-output buffer, to go to the lines
-where grep found matches.
+output buffer, to go to the lines where grep
+found matches.
 
 For doing a recursive `grep', see the `rgrep' command.  For running
 `grep' in a specific directory, see `lgrep'.
 
-This command uses a special history list for its COMMAND-ARGS, so you can
-easily repeat a grep command.
+This command uses a special history list for its COMMAND-ARGS, so you
+can easily repeat a grep command.
 
 A prefix argument says to default the argument based upon the current
 tag the cursor is over, substituting it into the last grep command
-in the grep command history (or into `grep-command'
-if that history list is empty)."
+in the grep command history (or into `grep-command' if that history
+list is empty)."
   (interactive
    (progn
      (grep-compute-defaults)
@@ -736,8 +747,9 @@ before it is executed.
 With two \\[universal-argument] prefixes, directly edit and run `grep-command'.
 
 Collect output in a buffer.  While grep runs asynchronously, you
-can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error]
-in the grep output buffer, to go to the lines where grep found matches.
+can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \
+in the grep output buffer,
+to go to the lines where grep found matches.
 
 This command shares argument histories with \\[rgrep] and \\[grep]."
   (interactive
@@ -797,8 +809,9 @@ before it is executed.
 With two \\[universal-argument] prefixes, directly edit and run `grep-find-command'.
 
 Collect output in a buffer.  While find runs asynchronously, you
-can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error]
-in the grep output buffer, to go to the lines where grep found matches.
+can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \
+in the grep output buffer,
+to go to the lines where grep found matches.
 
 This command shares argument histories with \\[lgrep] and \\[grep-find]."
   (interactive
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index ce231f4c662..3c6736ac79b 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -318,6 +318,8 @@ Uses `gud-<MINOR-MODE>-directories' to find the source files."
         (setq directories (cdr directories)))
       result)))
 
+(declare-function gdb-create-define-alist "gdb-ui" ())
+
 (defun gud-find-file (file)
   ;; Don't get confused by double slashes in the name that comes from GDB.
   (while (string-match "//+" file)
@@ -709,6 +711,9 @@ The option \"--fullname\" must be included in this value."
 (defvar gud-filter-pending-text nil
   "Non-nil means this is text that has been saved for later in `gud-filter'.")
 
+;; If in gdba mode, gdb-ui is loaded.
+(declare-function gdb-restore-windows "gdb-ui" ())
+
 ;; The old gdb command (text command mode).  The new one is in gdb-ui.el.
 ;;;###autoload
 (defun gud-gdb (command-line)
@@ -2597,6 +2602,8 @@ It is saved for when this flag is not set.")
 (defvar gud-overlay-arrow-position nil)
 (add-to-list 'overlay-arrow-variable-list 'gud-overlay-arrow-position)
 
+(declare-function gdb-reset "gdb-ui" ())
+
 (defun gud-sentinel (proc msg)
   (cond ((null (buffer-name (process-buffer proc)))
          ;; buffer killed
@@ -2666,6 +2673,11 @@ Obeying it means displaying in another window the specified file and line."
     (setq gud-last-last-frame gud-last-frame
           gud-last-frame nil)))
 
+(declare-function global-hl-line-highlight  "hl-line" ())
+(declare-function hl-line-highlight         "hl-line" ())
+(declare-function gdb-display-source-buffer "gdb-ui"  (buffer))
+(declare-function gdb-display-buffer "gdb-ui" (buf dedicated &optional size))
+
 ;; Make sure the file named TRUE-FILE is in a buffer that appears on the screen
 ;; and that its line LINE is visible.
 ;; Put the overlay-arrow on the line LINE in that buffer.
@@ -2998,6 +3010,12 @@ Link exprs of the form:
        (t nil)))
      (t nil))))
 
+
+(declare-function c-langelem-sym "cc-defs" (langelem))
+(declare-function c-langelem-pos "cc-defs" (langelem))
+(declare-function syntax-symbol  "gud"     (x))
+(declare-function syntax-point   "gud"     (x))
+
 (defun gud-find-class (f line)
   "Find fully qualified class in file F at line LINE.
 This function uses the `gud-jdb-classpath' (and optional
@@ -3383,6 +3401,8 @@ With arg, dereference expr if ARG is positive, otherwise do not derereference."
         ((xdb pdb) (concat "p " expr))
         (sdb (concat expr "/"))))
 
+(declare-function gdb-enqueue-input "gdb-ui" (item))
+
 (defun gud-tooltip-tips (event)
   "Show tip for identifier or selection under the mouse.
 The mouse must either point at an identifier or inside a selected
diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el
index d005c6de63e..cfd9834abca 100644
--- a/lisp/progmodes/idlw-complete-structtag.el
+++ b/lisp/progmodes/idlw-complete-structtag.el
@@ -91,6 +91,8 @@
 
 (require 'idlwave)
 
+(declare-function idlwave-shell-buffer "idlw-shell")
+
 ;; Some variables to identify the previously used structure
 (defvar idlwave-current-tags-var nil)
 (defvar idlwave-current-tags-buffer nil)
@@ -101,6 +103,7 @@
 (defvar idlwave-sint-structtags nil)
 
 ;; Create the sintern type for structure talks
+(declare-function idlwave-sintern-structtag "idlw-complete-structtag" t t)
 (idlwave-new-sintern-type 'structtag)
 
 ;; Hook the plugin into idlwave
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 2269e179357..69f24686e82 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -42,13 +42,10 @@
 
 
 ;;; Code:
-(defvar idlwave-help-browse-url-available nil
+(defvar idlwave-help-browse-url-available t
   "Whether browse-url is available")
 
-(setq idlwave-help-browse-url-available
-      (condition-case nil
-          (require 'browse-url)
-        (error nil)))
+(require 'browse-url)
 
 (defgroup idlwave-online-help nil
   "Online Help options for IDLWAVE mode."
@@ -258,6 +255,39 @@ support."
 (defvar idlwave-help-def-pos)
 (defvar idlwave-help-args)
 (defvar idlwave-help-in-header)
+(declare-function idlwave-prepare-structure-tag-completion "idlw-complete-structtag")
+(declare-function idlwave-all-method-classes "idlwave")
+(declare-function idlwave-all-method-keyword-classes "idlwave")
+(declare-function idlwave-beginning-of-statement "idlwave")
+(declare-function idlwave-best-rinfo-assoc "idlwave")
+(declare-function idlwave-class-found-in "idlwave")
+(declare-function idlwave-class-or-superclass-with-tag "idlwave")
+(declare-function idlwave-completing-read "idlwave")
+(declare-function idlwave-current-routine "idlwave")
+(declare-function idlwave-downcase-safe "idlwave")
+(declare-function idlwave-entry-find-keyword "idlwave")
+(declare-function idlwave-expand-keyword "idlwave")
+(declare-function idlwave-find-class-definition "idlwave")
+(declare-function idlwave-find-inherited-class "idlwave")
+(declare-function idlwave-find-struct-tag "idlwave")
+(declare-function idlwave-get-buffer-visiting "idlwave")
+(declare-function idlwave-in-quote "idlwave")
+(declare-function idlwave-make-full-name "idlwave")
+(declare-function idlwave-members-only "idlwave")
+(declare-function idlwave-popup-select "idlwave")
+(declare-function idlwave-routine-source-file "idlwave")
+(declare-function idlwave-routines "idlwave")
+(declare-function idlwave-sintern-class "idlwave")
+(declare-function idlwave-sintern-keyword "idlwave")
+(declare-function idlwave-sintern-method "idlwave")
+(declare-function idlwave-sintern-routine-or-method "idlwave")
+(declare-function idlwave-sintern-sysvar "idlwave" t t);idlwave-new-sintern-type
+(declare-function idlwave-sintern-sysvartag "idlwave" t t)
+(declare-function idlwave-substitute-link-target "idlwave")
+(declare-function idlwave-sys-dir "idlwave")
+(declare-function idlwave-this-word "idlwave")
+(declare-function idlwave-what-module-find-class "idlwave")
+(declare-function idlwave-where "idlwave")
 
 (defun idlwave-help-mode ()
   "Major mode for displaying IDL Help.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index abe5cfe6489..9648494adc4 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -182,6 +182,13 @@
     (defmacro defcustom (var value doc &rest args)
       `(defvar ,var ,value ,doc))))
 
+(declare-function idlwave-shell-get-path-info "idlw-shell")
+(declare-function idlwave-shell-temp-file "idlw-shell")
+(declare-function idlwave-shell-is-running "idlw-shell")
+(declare-function widget-value "wid-edit" (widget))
+(declare-function comint-dynamic-complete-filename "comint" ())
+(declare-function Info-goto-node "info" (nodename &optional fork))
+
 (defgroup idlwave nil
   "Major mode for editing IDL .pro files."
   :tag "IDLWAVE"
@@ -7599,6 +7606,7 @@ property indicating the link is added."
 (defvar idlwave-current-class-tags nil)
 (defvar idlwave-current-native-class-tags nil)
 (defvar idlwave-sint-class-tags nil)
+(declare-function idlwave-sintern-class-tag "idlwave" t t)
 (idlwave-new-sintern-type 'class-tag)
 (add-to-list 'idlwave-complete-special 'idlwave-complete-class-structure-tag)
 (add-hook 'idlwave-update-rinfo-hook 'idlwave-class-tag-reset)
@@ -7657,6 +7665,8 @@ property indicating the link is added."
 
 (defvar idlwave-sint-sysvars nil)
 (defvar idlwave-sint-sysvartags nil)
+(declare-function idlwave-sintern-sysvar    "idlwave" t t)
+(declare-function idlwave-sintern-sysvartag "idlwave" t t)
 (idlwave-new-sintern-type 'sysvar)
 (idlwave-new-sintern-type 'sysvartag)
 (add-to-list 'idlwave-complete-special 'idlwave-complete-sysvar-or-tag)
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index a0d33f56ee4..e8246ddb816 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -52,6 +52,8 @@
 (defvar inferior-octave-output-string nil)
 (defvar inferior-octave-receive-in-progress nil)
 
+(declare-function inferior-octave-send-list-and-digest "octave-inf" (list))
+
 (defconst octave-maintainer-address
   "Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>, bug-gnu-emacs@gnu.org"
   "Current maintainer of the Emacs Octave package.")
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index bb71491da2d..af456f98284 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -266,7 +266,9 @@ The expansion is entirely correct because it uses the C preprocessor."
     ;; format statements
     ("^[ \t]*format.*=[ \t]*\\(\n\\)" (1 '(7)))
     ;; Funny things in sub arg specifications like `sub myfunc ($$)'
-    ("\\<sub\\s-+\\S-+\\s-*(\\([^)]+\\))" 1 '(1))
+    ;; Be careful not to match "sub { (...) ... }".
+    ("\\<sub[[:space:]]+[^{}[:punct:][:space:]]+[[:space:]]*(\\([^)]+\\))"
+     1 '(1))
     ;; Regexp and funny quotes.
     ("\\(?:[?:.,;=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)"
      (2 (if (and (match-end 1)
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 3583f546754..dd3503f16b0 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -240,6 +240,11 @@ rigidly along with this one (not yet)."
 (defvar inferior-prolog-mode-syntax-table prolog-mode-syntax-table)
 (defvar inferior-prolog-mode-abbrev-table prolog-mode-abbrev-table)
 
+(declare-function comint-mode "comint")
+(declare-function comint-send-string "comint" (process string))
+(declare-function comint-send-region "comint" (process start end))
+(declare-function comint-send-eof "comint" ())
+
 (define-derived-mode inferior-prolog-mode comint-mode "Inferior Prolog"
   "Major mode for interacting with an inferior Prolog process.
 
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index c131575f57c..6327a68302b 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -480,6 +480,9 @@ If nil, the following are tried in turn, until success:
       (setq i (1+ i)))))
 
 
+
+(declare-function doc-view-minor-mode "doc-view")
+
 ;; PostScript mode.
 
 ;;;###autoload
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f54b7c9f928..66779acb103 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -65,7 +65,6 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
   (require 'compile)
   (require 'comint)
   (require 'hippie-exp))
@@ -1224,6 +1223,9 @@ local value.")
     ;; (modify-syntax-entry ?\" "." st)
     st))
 
+;; Autoloaded.
+(declare-function compilation-shell-minor-mode "compile" (&optional arg))
+
 ;; Fixme: This should inherit some stuff from `python-mode', but I'm
 ;; not sure how much: at least some keybindings, like C-c C-f;
 ;; syntax?; font-locking, e.g. for triple-quoted strings?
@@ -1656,6 +1658,8 @@ instance.  Assumes an inferior Python is running."
 
 ;;;; Info-look functionality.
 
+(declare-function info-lookup-maybe-add-help "info-look" (&rest arg))
+
 (defun python-after-info-look ()
   "Set up info-look for Python.
 Used with `eval-after-load'."
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e9d9247d7cb..cd08fea2910 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1524,6 +1524,8 @@ with your script for an edit-interpret-debug cycle."
         skeleton-filter-function 'sh-feature
         skeleton-newline-indent-rigidly t
         sh-indent-supported-here nil)
+  (set (make-local-variable 'defun-prompt-regexp)
+       (concat "^\\(function[ \t]\\|[[:alnum:]]+[ \t]+()[ \t]+\\)"))
   (set (make-local-variable 'parse-sexp-ignore-comments) t)
   ;; Parse or insert magic number for exec, and set all variables depending
   ;; on the shell thus determined.