merge trunk

6 files changed, 59 insertions, 32 deletions

diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 97fcb6874dd..3561105e59d 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -74,6 +74,7 @@ so that it is considered safe, see `enable-local-variables'.")
 The second subexpression should match the bug reference (usually a number)."
   :type 'string
   :safe 'stringp
+  :version "24.3"                       ; previously defconst
   :group 'bug-reference)
 
 (defun bug-reference-set-overlay-properties ()
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 10d5fdf9c64..26d4a399c2d 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -768,6 +768,7 @@ line number outside the file being compiled."
 The value may also be a list of two elements where the second
 element specifies the face for the bitmap."
   :group 'flymake
+  :version "24.3"
   :type 'symbol)
 
 (defcustom flymake-warning-bitmap 'question-mark
@@ -775,6 +776,7 @@ element specifies the face for the bitmap."
 The value may also be a list of two elements where the second
 element specifies the face for the bitmap."
   :group 'flymake
+  :version "24.3"
   :type 'symbol)
 
 (defcustom flymake-fringe-indicator-position 'left-fringe
@@ -782,6 +784,7 @@ element specifies the face for the bitmap."
 The value can be nil, left-fringe or right-fringe.
 Fringe indicators are disabled if nil."
   :group 'flymake
+  :version "24.3"
   :type '(choice (const left-fringe)
                  (const right-fringe)
                  (const :tag "No fringe indicators" nil)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b3b3b0181d7..726c0b2d542 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1667,10 +1667,6 @@ variable.
 \(Type \\[describe-mode] in the process buffer for a list of commands.)"
   (set-syntax-table python-mode-syntax-table)
   (setq mode-line-process '(":%s"))
-  (setq comint-prompt-regexp (format "^\\(?:%s\\|%s\\|%s\\)"
-                                     python-shell-prompt-regexp
-                                     python-shell-prompt-block-regexp
-                                     python-shell-prompt-pdb-regexp))
   (make-local-variable 'comint-output-filter-functions)
   (add-hook 'comint-output-filter-functions
             'python-comint-output-filter-function)
@@ -1720,7 +1716,11 @@ killed."
                (process (get-buffer-process buffer)))
           (with-current-buffer buffer
             (inferior-python-mode)
-            (python-util-clone-local-variables current-buffer))
+            (python-util-clone-local-variables current-buffer)
+            (setq comint-prompt-regexp (format "^\\(?:%s\\|%s\\|%s\\)"
+                                               python-shell-prompt-regexp
+                                               python-shell-prompt-block-regexp
+                                               python-shell-prompt-pdb-regexp)))
           (accept-process-output process)
           (and pop (pop-to-buffer buffer t))
           (and internal (set-process-query-on-exit-flag process nil))))
@@ -1861,26 +1861,39 @@ When MSG is non-nil messages the first line of STRING."
                 (string-match "\n[ \t].*\n?$" string))
         (comint-send-string process "\n")))))
 
-;; Shell output catching stolen from gud-gdb
-(defvar python-shell-fetch-lines-in-progress nil)
-(defvar python-shell-fetch-lines-string nil)
-(defvar python-shell-fetched-lines nil)
-
-(defun python-shell-fetch-lines-filter (string)
-  "Filter used to read the list of lines output by a command.
-STRING is the output to filter."
-  (setq string (concat python-shell-fetch-lines-string string))
-  (while (string-match "\n" string)
-    (push (substring string 0 (match-beginning 0))
-          python-shell-fetched-lines)
-    (setq string (substring string (match-end 0))))
-  (if (equal (string-match comint-prompt-regexp string) 0)
-      (progn
-        (setq python-shell-fetch-lines-in-progress nil)
-        string)
-    (progn
-      (setq python-shell-fetch-lines-string string)
-      "")))
+(defvar python-shell-output-filter-in-progress nil)
+(defvar python-shell-output-filter-buffer nil)
+
+(defun python-shell-output-filter (string)
+  "Filter used in `python-shell-send-string-no-output' to grab output.
+STRING is the output received to this point from the process.
+This filter saves received output from the process in
+`python-shell-output-filter-buffer' and stops receiving it after
+detecting a prompt at the end of the buffer."
+  (setq
+   string (ansi-color-filter-apply string)
+   python-shell-output-filter-buffer
+   (concat python-shell-output-filter-buffer string))
+  (when (string-match
+         (format "\n\\(?:%s\\|%s\\|%s\\)$"
+                 python-shell-prompt-regexp
+                 python-shell-prompt-block-regexp
+                 python-shell-prompt-pdb-regexp)
+         python-shell-output-filter-buffer)
+    ;; Output ends when `python-shell-output-filter-buffer' contains
+    ;; the prompt attached at the end of it.
+    (setq python-shell-output-filter-in-progress nil
+          python-shell-output-filter-buffer
+          (substring python-shell-output-filter-buffer
+                     0 (match-beginning 0)))
+    (when (and (> (length python-shell-prompt-output-regexp) 0)
+               (string-match (concat "^" python-shell-prompt-output-regexp)
+                             python-shell-output-filter-buffer))
+      ;; Some shells, like iPython might append a prompt before the
+      ;; output, clean that.
+      (setq python-shell-output-filter-buffer
+            (substring python-shell-output-filter-buffer (match-end 0)))))
+  "")
 
 (defun python-shell-send-string-no-output (string &optional process msg)
   "Send STRING to PROCESS and inhibit output.
@@ -1888,18 +1901,20 @@ When MSG is non-nil messages the first line of STRING.  Return
 the output."
   (let ((process (or process (python-shell-get-or-create-process)))
         (comint-preoutput-filter-functions
-         '(python-shell-fetch-lines-filter))
-        (python-shell-fetch-lines-in-progress t)
+         '(python-shell-output-filter))
+        (python-shell-output-filter-in-progress t)
         (inhibit-quit t))
     (or
      (with-local-quit
        (python-shell-send-string string process msg)
-       (while python-shell-fetch-lines-in-progress
+       (while python-shell-output-filter-in-progress
+         ;; `python-shell-output-filter' takes care of setting
+         ;; `python-shell-output-filter-in-progress' to NIL after it
+         ;; detects end of output.
          (accept-process-output process))
        (prog1
-           (mapconcat #'identity
-                      (reverse python-shell-fetched-lines) "\n")
-         (setq python-shell-fetched-lines nil)))
+           python-shell-output-filter-buffer
+         (setq python-shell-output-filter-buffer nil)))
      (with-current-buffer (process-buffer process)
        (comint-interrupt-subjob)))))
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e94919ee2a9..06ded5fb53d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1767,7 +1767,9 @@ Does not preserve point."
 
 (defcustom sh-indent-after-continuation t
   "If non-nil, try to make sure text is indented after a line continuation."
-  :type 'boolean)
+  :version "24.3"
+  :type 'boolean
+  :group 'sh-indentation)
 
 (defun sh-smie--continuation-start-indent ()
   "Return the initial indentation of a continued line.
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 8c4167b6724..6ffe88f721e 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -1159,6 +1159,7 @@ See the \\[verilog-faq] for examples on using this."
   "Non-nil means report warning if an AUTO_TEMPLATE line is not used.
 This feature is not supported before Emacs 21.1 or XEmacs 21.4."
   :group 'verilog-mode-auto
+  :version "24.3"
   :type 'boolean)
 (put 'verilog-auto-template-warn-unused 'safe-local-variable 'verilog-booleanp)
 
@@ -1230,11 +1231,13 @@ For example, \"_t$\" matches typedefs named with _t, as in the C language."
 (defcustom verilog-before-save-font-hook nil
   "Hook run before `verilog-save-font-mods' removes highlighting."
   :group 'verilog-mode-auto
+  :version "24.3"
   :type 'hook)
 
 (defcustom verilog-after-save-font-hook nil
   "Hook run after `verilog-save-font-mods' restores highlighting."
   :group 'verilog-mode-auto
+  :version "24.3"
   :type 'hook)
 
 (defvar verilog-imenu-generic-expression
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 52757b9eede..6ad7d3b168a 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -483,6 +483,7 @@ with other user Makefiles."
   :type '(list (string :tag "Compile entire design")
                (string :tag "Clean entire design  ")
                (string :tag "Create design library"))
+  :version "24.3"
   :group 'vhdl-compile)
 
 (defcustom vhdl-makefile-generation-hook nil
@@ -772,6 +773,7 @@ index, the record field or array index is included with the record name in
 the sensitivity list (e.g. \"in1(0)\", \"in2.f0\").
 Otherwise, only the record name is included (e.g. \"in1\", \"in2\")."
   :type 'boolean
+  :version "24.3"
   :group 'vhdl-style)
 
 (defgroup vhdl-naming nil
@@ -1849,6 +1851,7 @@ Otherwise, comment lines are indented like the preceding code line.
 Indenting comment lines like the following code line gives nicer indentation
 when comments precede the code that they refer to."
   :type 'boolean
+  :version "24.3"
   :group 'vhdl-misc)
 
 (defcustom vhdl-word-completion-case-sensitive nil