merge from trunk

17 files changed, 267 insertions, 115 deletions

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 805444d08b9..33b21d6cc07 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -130,6 +130,8 @@
 (defvar ispell-check-comments)
 (defvar skeleton-further-elements)
 
+(define-error 'ada-mode-errors nil)
+
 (defun ada-mode-version ()
   "Return Ada mode version."
   (interactive)
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index e44b7c191bf..d29fa8c1d36 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1142,7 +1142,7 @@ If OTHER-FRAME is non-nil, display the cross-reference in another frame."
     (condition-case err
         (ada-find-in-ali identlist other-frame)
       ;; File not found: print explicit error message
-      (error-file-not-found
+      (ada-error-file-not-found
        (message (concat (error-message-string err)
                         (nthcdr 1 err))))
 
@@ -1637,7 +1637,7 @@ Search in project file for possible paths."
     (let ((filename (ada-find-src-file-in-dir file)))
       (if filename
           (expand-file-name filename)
-        (signal 'error-file-not-found (file-name-nondirectory file)))
+        (signal 'ada-error-file-not-found (file-name-nondirectory file)))
       )))
 
 (defun ada-find-file-number-in-ali (file)
@@ -1828,7 +1828,7 @@ Information is extracted from the ali file."
                                           (ada-file-of identlist)))
 
                 ;;  Else clean up the ali file
-                (error-file-not-found
+                (ada-error-file-not-found
                  (signal (car err) (cdr err)))
                 (error
                  (kill-buffer ali-buffer)
@@ -2127,7 +2127,7 @@ the declaration and documentation of the subprograms one is using."
                                   (string-to-number (nth 2 (nth choice list)))
                                   identlist
                                   other-frame)
-        (signal 'error-file-not-found (car (nth choice list))))
+        (signal 'ada-error-file-not-found (car (nth choice list))))
       (message "This is only a (good) guess at the cross-reference.")
       ))))
 
@@ -2362,12 +2362,8 @@ For instance, it creates the gnat-specific menus, sets some hooks for
 (add-hook 'ada-mode-hook 'ada-xref-initialize)
 
 ;;  Define a new error type
-(put 'error-file-not-found
-     'error-conditions
-     '(error ada-mode-errors error-file-not-found))
-(put 'error-file-not-found
-     'error-message
-     "File not found in src-dir (check project file): ")
+(define-error 'ada-error-file-not-found
+  "File not found in src-dir (check project file): " 'ada-mode-errors)
 
 (provide 'ada-xref)
 
diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el
new file mode 100644
index 00000000000..2b6f9d3434d
--- /dev/null
+++ b/lisp/progmodes/bat-mode.el
@@ -0,0 +1,185 @@
+;;; bat-mode.el --- Major mode for editing DOS/Windows scripts
+
+;; Copyright (C) 2003, 2008-2013 Free Software Foundation, Inc.
+
+;; Author: Arni Magnusson <arnima@hafro.is>
+;; Keywords: languages
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Major mode for editing DOS/Windows scripts (batch files).  Provides syntax
+;; highlighting, a basic template, access to DOS help pages, imenu/outline
+;; navigation, and the ability to run scripts from within Emacs.  The syntax
+;; groups for highlighting are:
+;;
+;; Face                          Example
+;; bat-label-face                :LABEL
+;; font-lock-comment-face        rem
+;; font-lock-builtin-face        copy
+;; font-lock-keyword-face        goto
+;; font-lock-warning-face        cp
+;; font-lock-constant-face       [call] prog
+;; font-lock-variable-name-face  %var%
+;; font-lock-type-face           -option
+;;
+;; Usage:
+;;
+;; See documentation of function `bat-mode'.
+;;
+;; Separate package `dos-indent' (Matthew Fidler) provides rudimentary
+;; indentation, see http://www.emacswiki.org/emacs/dos-indent.el.
+;;
+;; Acknowledgements:
+;;
+;; Inspired by `batch-mode' (Agnar Renolen) and `cmd-mode' (Tadamegu Furukawa).
+
+;;; Code:
+
+;; 1  Preamble
+
+(defgroup bat-mode nil
+  "Major mode for editing DOS/Windows batch files."
+  :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
+  :group 'languages)
+
+;; 2  User variables
+
+(defface bat-label-face '((t :weight bold))
+  "Font Lock mode face used to highlight labels in batch files.")
+
+;; 3  Internal variables
+
+(defvar bat-font-lock-keywords
+  (eval-when-compile
+    (let ((COMMANDS
+           '("assoc" "at" "attrib" "cd" "cls" "color" "copy" "date" "del" "dir"
+             "doskey" "echo" "endlocal" "erase" "fc" "find" "findstr" "format"
+             "ftype" "label" "md" "mkdir" "more" "move" "net" "path" "pause"
+             "popd" "prompt" "pushd" "rd" "ren" "rename" "replace" "rmdir" "set"
+             "setlocal" "shift" "sort" "subst" "time" "title" "tree" "type"
+             "ver" "vol" "xcopy"))
+          (CONTROLFLOW
+           '("call" "cmd" "defined" "do" "else" "equ" "exist" "exit" "for" "geq"
+             "goto" "gtr" "if" "in" "leq" "lss" "neq" "not" "start"))
+          (UNIX
+           '("bash" "cat" "cp" "fgrep" "grep" "ls" "sed" "sh" "mv" "rm")))
+      `(("\\<_\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?"
+         (2 font-lock-constant-face t))
+        ("^:[^:].*"
+         . 'bat-label-face)
+        ("\\<_\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)"
+         (2 font-lock-variable-name-face))
+        ("%\\(\\w+\\)%?"
+         (1 font-lock-variable-name-face))
+        ("!\\(\\w+\\)!?"                ; delayed-expansion !variable!
+         (1 font-lock-variable-name-face))
+        ("[ =][-/]+\\(\\w+\\)"
+         (1 font-lock-type-face append))
+        (,(concat "\\_<" (regexp-opt COMMANDS) "\\_>") . font-lock-builtin-face)
+        (,(concat "\\_<" (regexp-opt CONTROLFLOW) "\\_>")
+         . font-lock-keyword-face)
+        (,(concat "\\_<" (regexp-opt UNIX) "\\_>")
+         . font-lock-warning-face)))))
+
+(defvar bat-menu
+  '("Bat"
+    ["Run" bat-run :help "Run script"]
+    ["Run with Args" bat-run-args :help "Run script with args"]
+    "--"
+    ["Imenu" imenu :help "Navigate with imenu"]
+    "--"
+    ["Template" bat-template :help "Insert template"]
+    "--"
+    ["Help (Command)" bat-cmd-help :help "Show help page for DOS command"]))
+
+(defvar bat-mode-map
+  (let ((map (make-sparse-keymap)))
+    (easy-menu-define nil map nil bat-menu)
+    (define-key map [?\C-c ?\C-/] 'bat-cmd-help) ;FIXME: Why not C-c C-? ?
+    (define-key map [?\C-c ?\C-a] 'bat-run-args)
+    (define-key map [?\C-c ?\C-c] 'bat-run)
+    (define-key map [?\C-c ?\C-t] 'bat-template)
+    (define-key map [?\C-c ?\C-v] 'bat-run)
+    map))
+
+(defvar bat-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?\n ">" table)
+    ;; Beware: `w' should not be used for non-alphabetic chars.
+    (modify-syntax-entry ?~ "_" table)
+    (modify-syntax-entry ?% "." table)
+    (modify-syntax-entry ?- "_" table)
+    (modify-syntax-entry ?_ "_" table)
+    ;; FIXME: { and } can appear in identifiers?  Really?
+    (modify-syntax-entry ?{ "_" table)
+    (modify-syntax-entry ?} "_" table)
+    (modify-syntax-entry ?\\ "." table)
+    table))
+
+(defconst bat--syntax-propertize
+  (syntax-propertize-rules
+   ("^[ \t]*\\(?:\\(@?r\\)em\\_>\\|\\(?1::\\):\\).*" (1 "<"))))
+
+;; 4  User functions
+
+(defun bat-cmd-help (cmd)
+  "Show help for batch file command CMD."
+  (interactive "sHelp: ")
+  (if (string-equal cmd "net")
+      ;; FIXME: liable to quoting nightmare.  Use call-process?
+      (shell-command "net /?") (shell-command (concat "help " cmd))))
+
+(defun bat-run ()
+  "Run a batch file."
+  (interactive)
+  ;; FIXME: liable to quoting nightmare.  Use call/start-process?
+  (save-buffer) (shell-command buffer-file-name))
+
+(defun bat-run-args (args)
+  "Run a batch file with ARGS."
+  (interactive "sArgs: ")
+  ;; FIXME: Use `compile'?
+  (shell-command (concat buffer-file-name " " args)))
+
+(defun bat-template ()
+  "Insert minimal batch file template."
+  (interactive)
+  (goto-char (point-min)) (insert "@echo off\nsetlocal\n\n"))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode))
+
+;; 5  Main function
+
+;;;###autoload
+(define-derived-mode bat-mode prog-mode "Bat"
+  "Major mode for editing DOS/Windows batch files.\n
+Start a new script from `bat-template'.  Read help pages for DOS commands
+with `bat-cmd-help'.  Navigate between sections using `imenu'.
+Run script using `bat-run' and `bat-run-args'.\n
+\\{bat-mode-map}"
+  (setq-local comment-start "rem ")
+  (setq-local syntax-propertize-function bat--syntax-propertize)
+  (setq-local font-lock-defaults
+       '(bat-font-lock-keywords nil t)) ; case-insensitive keywords
+  (setq-local imenu-generic-expression '((nil "^:[^:].*" 0)))
+  (setq-local outline-regexp ":[^:]"))
+
+(provide 'bat-mode)
+
+;;; bat-mode.el ends here
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index a3bd000a4f3..c2ff5011a0e 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1135,9 +1135,13 @@ comment at the start of cc-engine.el for more info."
                    (not (memq sym '(boundary ignore nil))))
           ;; Need to investigate closer whether we've crossed
           ;; between a substatement and its containing statement.
-          (if (setq saved (if (looking-at c-block-stmt-1-key)
-                              ptok
-                            pptok))
+          (if (setq saved
+                    (cond ((and (looking-at c-block-stmt-1-2-key)
+                                (eq (char-after ptok) ?\())
+                           pptok)
+                          ((looking-at c-block-stmt-1-key)
+                           ptok)
+                          (t pptok)))
               (cond ((> start saved) (setq pos saved))
                     ((= start saved) (setq ret 'up)))))
 
@@ -7988,7 +7992,8 @@ comment at the start of cc-engine.el for more info."
          (or (looking-at c-block-stmt-1-key)
              (and (eq (char-after) ?\()
                   (zerop (c-backward-token-2 1 t lim))
-                  (looking-at c-block-stmt-2-key)))
+                  (or (looking-at c-block-stmt-2-key)
+                      (looking-at c-block-stmt-1-2-key))))
          (point))))
 
 (defun c-after-special-operator-id (&optional lim)
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 6a4bfd9e875..4e8ce6bac28 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1307,7 +1307,8 @@ casts and declarations are fontified.  Used on level 2 and higher."
                             (goto-char match-pos)
                             (backward-char)
                             (c-backward-token-2)
-                            (looking-at c-block-stmt-2-key)))
+                            (or (looking-at c-block-stmt-2-key)
+                                (looking-at c-block-stmt-1-2-key))))
                      (setq context nil
                            c-restricted-<>-arglists t))
                     ;; Near BOB.
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index af52ad53aad..2c0a1317b04 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2187,6 +2187,18 @@ identifiers that follows the type in a normal declaration."
   t (c-make-keywords-re t (c-lang-const c-block-stmt-1-kwds)))
 (c-lang-defvar c-block-stmt-1-key (c-lang-const c-block-stmt-1-key))
 
+(c-lang-defconst c-block-stmt-1-2-kwds
+  "Statement keywords optionally followed by a paren sexp.
+Keywords here should also be in `c-block-stmt-1-kwds'."
+  t nil
+  java '("try"))
+
+(c-lang-defconst c-block-stmt-1-2-key
+  ;; Regexp matching the start of a statement which may be followed by a
+  ;; paren sexp and will then be followed by a substatement.
+  t (c-make-keywords-re t (c-lang-const c-block-stmt-1-2-kwds)))
+(c-lang-defvar c-block-stmt-1-2-key (c-lang-const c-block-stmt-1-2-key))
+
 (c-lang-defconst c-block-stmt-2-kwds
   "Statement keywords followed by a paren sexp and then by a substatement."
   t    '("for" "if" "switch" "while")
@@ -2938,7 +2950,8 @@ identifier or one of the keywords on `c-<>-type-kwds' or
 `c-<>-arglist-kwds'.  If there's an identifier before then the whole
 expression is considered to be a type."
   t (or (consp (c-lang-const c-<>-type-kwds))
-        (consp (c-lang-const c-<>-arglist-kwds))))
+        (consp (c-lang-const c-<>-arglist-kwds)))
+  java t)
 (c-lang-defvar c-recognize-<>-arglists (c-lang-const c-recognize-<>-arglists))
 
 (c-lang-defconst c-enums-contain-decls
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d9c482330cc..8c981b36e56 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -624,7 +624,9 @@ You might also use mode hooks to specify it in certain modes, like this:
                      (file-exists-p \"Makefile\"))
            (set (make-local-variable 'compile-command)
                 (concat \"make -k \"
-                        (file-name-sans-extension buffer-file-name))))))"
+                        (if buffer-file-name
+                          (shell-quote-argument
+                            (file-name-sans-extension buffer-file-name))))))))"
   :type 'string
   :group 'compilation)
 ;;;###autoload(put 'compile-command 'safe-local-variable (lambda (a) (and (stringp a) (or (not (boundp 'compilation-read-command)) compilation-read-command))))
@@ -2492,7 +2494,7 @@ displays at the top of the window; there is no arrow."
 All arguments are markers.  If END-MK is non-nil, mark is set there
 and overlay is highlighted between MK and END-MK."
   ;; Show compilation buffer in other window, scrolled to this error.
-  (let* ((from-compilation-buffer (eq (window-buffer (selected-window))
+  (let* ((from-compilation-buffer (eq (window-buffer)
                                       (marker-buffer msg)))
          ;; Use an existing window if it is in a visible frame.
          (pre-existing (get-buffer-window (marker-buffer msg) 0))
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 6a71ab330a8..865211d109c 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1605,7 +1605,7 @@ specifies where to find/view the result."
   ;; Get the source file to view or find.
   (setf file (ebrowse-find-source-file file tags-file))
   ;; If current window is dedicated, use another frame.
-  (when (window-dedicated-p (selected-window))
+  (when (window-dedicated-p)
     (setf where 'other-window))
   (cond (view
          (setf ebrowse-temp-position-to-view struc
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index ff6321d74c3..a7b7e630bb9 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -982,7 +982,7 @@ See documentation of variable `tags-file-name'."
   ;; selected window's buffer; without the hair, point is moved in both
   ;; windows.  To prevent this, we save the selected window's point before
   ;; doing find-tag-noselect, and restore it after.
-  (let* ((window-point (window-point (selected-window)))
+  (let* ((window-point (window-point))
          (tagbuf (find-tag-noselect tagname next-p regexp-p))
          (tagpoint (progn (set-buffer tagbuf) (point))))
     (set-window-point (prog1
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 9bde2900a67..80f663360e4 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1026,7 +1026,7 @@ Set subexpression 1 in the match-data to the name of the type."
   (if (lookup-key (current-local-map) [menu-bar index])
       (message "%s" "F90-imenu already exists.")
     (imenu-add-to-menubar "F90-imenu")
-    (redraw-frame (selected-frame))))
+    (redraw-frame)))
 
 
 ;; Abbrevs have generally two letters, except standard types `c, `i, `r, `t.
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index ff667f80f9d..0fc805aae81 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1080,8 +1080,7 @@ The next key typed is executed unless it is SPC."
      fortran-column-ruler-fixed)
    (save-excursion
      (beginning-of-line)
-     (if (eq (window-start (selected-window))
-             (window-point (selected-window)))
+     (if (eq (window-start) (window-point))
          (line-beginning-position 2)
        (point)))
    nil "Type SPC or any command to erase ruler."))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 4b51a5e7835..2017636435c 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2951,7 +2951,7 @@ If not in a source or disassembly buffer just set point."
          obj)
     (when (numberp pos)
       (with-selected-window (posn-window posn)
-        (with-current-buffer (window-buffer (selected-window))
+        (with-current-buffer (window-buffer)
           (goto-char pos)
           (dolist (overlay (overlays-in pos pos))
             (when (overlay-get overlay 'put-break)
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index d255b8b1a3f..98f9ee3b530 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -962,7 +962,7 @@ static char * file[] = {
   (if (featurep 'xemacs)
       nil ; no action necessary, toolbar gets updated automatically
     ;; On Emacs, redraw the frame to make sure the Toolbar is updated.
-    (redraw-frame (selected-frame))))
+    (redraw-frame)))
 
 (provide 'idlw-toolbar)
 (provide 'idlwave-toolbar)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 28ee859f9db..49a21933133 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -2244,11 +2244,8 @@ current buffer.  Pushes a mark onto the tag ring just like
 
 ;;; MozRepl integration
 
-(put 'js-moz-bad-rpc 'error-conditions '(error timeout))
-(put 'js-moz-bad-rpc 'error-message "Mozilla RPC Error")
-
-(put 'js-js-error 'error-conditions '(error js-error))
-(put 'js-js-error 'error-message "Javascript Error")
+(define-error 'js-moz-bad-rpc "Mozilla RPC Error") ;; '(timeout error))
+(define-error 'js-js-error "Javascript Error") ;; '(js-error error))
 
 (defun js--wait-for-matching-output
   (process regexp timeout &optional start)
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 8814cdbba35..a14654cdd7c 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1113,8 +1113,10 @@ Assumes that file has been compiled with debugging support."
        mixal-syntax-propertize-function)
   ;; might add an indent function in the future
   ;;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
-  (set (make-local-variable 'compile-command) (concat "mixasm "
-                                                      buffer-file-name)))
+  (set (make-local-variable 'compile-command)
+       (concat "mixasm "
+               (if buffer-file-name
+                   (shell-quote-argument buffer-file-name)))))
 
 (provide 'mixal-mode)
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 62870f9085b..01833ffd70b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3042,32 +3042,22 @@ It must be a function with two arguments: TYPE and NAME.")
       "*class definition*"
     "*function definition*"))
 
-(defun python-imenu--put-parent (type name pos num-children tree &optional root)
-  "Add the parent with TYPE, NAME, POS and NUM-CHILDREN to TREE.
-Optional Argument ROOT must be non-nil when the node being
-processed is the root of the TREE."
+(defun python-imenu--put-parent (type name pos tree)
+  "Add the parent with TYPE, NAME and POS to TREE."
   (let ((label
          (funcall python-imenu-format-item-label-function type name))
         (jump-label
          (funcall python-imenu-format-parent-item-jump-label-function type name)))
-    (if root
-        ;; This is the root, everything is a children.
-        (cons label (cons (cons jump-label pos) tree))
-      ;; This is node a which may contain some children.
-      (cons
-       (cons label (cons (cons jump-label pos)
-                         ;; Append all the children
-                         (python-util-popn tree num-children)))
-       ;; All previous non-children nodes.
-       (nthcdr num-children tree)))))
+    (if (not tree)
+        (cons label pos)
+      (cons label (cons (cons jump-label pos) tree)))))
 
-(defun python-imenu--build-tree (&optional min-indent prev-indent num-children tree)
+(defun python-imenu--build-tree (&optional min-indent prev-indent tree)
   "Recursively build the tree of nested definitions of a node.
-Arguments MIN-INDENT PREV-INDENT NUM-CHILDREN and TREE are
-internal and should not be passed explicitly unless you know what
-you are doing."
-  (setq num-children (or num-children 0)
-        min-indent (or min-indent 0))
+Arguments MIN-INDENT PREV-INDENT and TREE are internal and should
+not be passed explicitly unless you know what you are doing."
+  (setq min-indent (or min-indent 0)
+        prev-indent (or prev-indent python-indent-offset))
   (let* ((pos (python-nav-backward-defun))
          (type)
          (name (when (and pos (looking-at python-nav-beginning-of-defun-regexp))
@@ -3076,73 +3066,33 @@ you are doing."
                    (cadr split))))
          (label (when name
                   (funcall python-imenu-format-item-label-function type name)))
-         (indent (current-indentation)))
+         (indent (current-indentation))
+         (children-indent-limit (+ python-indent-offset min-indent)))
     (cond ((not pos)
-           ;; No defun found, nothing to add.
-           tree)
-          ((equal indent 0)
-           (if (> num-children 0)
-               ;; Append it as the parent of everything collected to
-               ;; this point.
-               (python-imenu--put-parent type name pos num-children tree t)
-             ;; There are no children, this is a lonely defun.
-             (cons label pos)))
-          ((equal min-indent indent)
-           ;; Stop collecting nodes after moving to a position with
-           ;; indentation equaling min-indent. This is specially
-           ;; useful for navigating nested definitions recursively.
-           (if (> num-children 0)
-               tree
-             ;; When there are no children, the collected tree is a
-             ;; single node intended to be added in the list of defuns
-             ;; of its parent.
-             (car tree)))
+           ;; Nothing found, probably near to bobp.
+           nil)
+          ((<= indent min-indent)
+           ;; The current indentation points that this is a parent
+           ;; node, add it to the tree and stop recursing.
+           (python-imenu--put-parent type name pos tree))
           (t
            (python-imenu--build-tree
             min-indent
             indent
-            ;; Add another children, either when this is the
-            ;; first call or when indentation is
-            ;; less-or-equal than previous. And do not
-            ;; discard the number of children, because the
-            ;; way code is scanned, all children are
-            ;; collected until a root node yet to be found
-            ;; appears.
-            (if (or (not prev-indent)
-                    (and
-                     (> indent min-indent)
-                     (<= indent prev-indent)))
-                (1+ num-children)
-              num-children)
-            (cond ((not prev-indent)
-                   ;; First call to the function: append this
-                   ;; defun to the index.
-                   (list (cons label pos)))
-                  ((= indent prev-indent)
-                   ;; Add another defun with the same depth
-                   ;; as the previous.
-                   (cons (cons label pos) tree))
-                  ((and (< indent prev-indent)
-                        (< 0 num-children))
-                   ;; There are children to be appended and
-                   ;; the previous defun had more
-                   ;; indentation, the current one must be a
-                   ;; parent.
-                   (python-imenu--put-parent type name pos num-children tree))
-                  ((> indent prev-indent)
-                   ;; There are children defuns deeper than
-                   ;; current depth. Fear not, we already
-                   ;; know how to treat them.
-                   (cons
-                    (prog1
-                        (python-imenu--build-tree
-                         prev-indent indent 0 (list (cons label pos)))
-                      ;; Adjustment: after scanning backwards
-                      ;; for all deeper children, we need to
-                      ;; continue our scan for a parent from
-                      ;; the current defun we are looking at.
-                      (python-nav-forward-defun))
-                    tree))))))))
+            (if (<= indent children-indent-limit)
+                ;; This lies within the children indent offset range,
+                ;; so it's a normal child of its parent (i.e., not
+                ;; a child of a child).
+                (cons (cons label pos) tree)
+              ;; Oh no, a child of a child?!  Fear not, we
+              ;; know how to roll.  We recursively parse these by
+              ;; swapping prev-indent and min-indent plus adding this
+              ;; newly found item to a fresh subtree.  This works, I
+              ;; promise.
+              (cons
+               (python-imenu--build-tree
+                prev-indent indent (list (cons label pos)))
+               tree)))))))
 
 (defun python-imenu-create-index ()
   "Return tree Imenu alist for the current python buffer.
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index ed911fcbba2..03364bddd9f 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -3256,7 +3256,7 @@ inserted using a single call to `verilog-insert'."
 (defun verilog-point-text (&optional pointnum)
   "Return text describing where POINTNUM or current point is (for errors).
 Use filename, if current buffer being edited shorten to just buffer name."
-  (concat (or (and (equal (window-buffer (selected-window)) (current-buffer))
+  (concat (or (and (equal (window-buffer) (current-buffer))
                    (buffer-name))
               buffer-file-name
               (buffer-name))