Merged from emacs@sv.gnu.org.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

5 files changed, 57 insertions, 37 deletions

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index b1ca93e2f32..d60746c5de8 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -31,9 +31,9 @@
 ;;; This mode is a major mode for editing Ada83 and Ada95 source code.
 ;;; This is a major rewrite of the file packaged with Emacs-20.  The
 ;;; ada-mode is composed of four lisp files, ada-mode.el, ada-xref.el,
-;;; ada-prj.el and ada-stmt.el.  Only this file (ada-mode.el) is
+;;; ada-prj.el and ada-stmt.el. Only this file (ada-mode.el) is
 ;;; completely independent from the GNU Ada compiler Gnat, distributed
-;;; by Ada Core Technologies.  All the other files rely heavily on
+;;; by Ada Core Technologies. All the other files rely heavily on
 ;;; features provided only by Gnat.
 ;;;
 ;;; Note: this mode will not work with Emacs 19. If you are on a VMS
@@ -962,7 +962,7 @@ OLD-LEN indicates what the length of the replaced text was."
 
 (defsubst ada-in-string-p (&optional parse-result)
   "Return t if point is inside a string.
-If parse-result is non-nil, use is instead of calling `parse-partial-sexp'."
+If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'."
   (nth 3 (or parse-result
              (parse-partial-sexp
               (line-beginning-position) (point)))))
@@ -2410,8 +2410,8 @@ offset."
        ;; else
 
        ((looking-at "else\\>")
-        (if (save-excursion  (ada-goto-previous-word)
-                             (looking-at "\\<or\\>"))
+        (if (save-excursion (ada-goto-previous-word)
+                            (looking-at "\\<or\\>"))
             (ada-indent-on-previous-lines nil orgpoint orgpoint)
           (save-excursion
             (ada-goto-matching-start 1 nil t)
@@ -4205,9 +4205,9 @@ of the region.  Otherwise, operate only on the current line."
 (defun ada-untab-hard ()
   "Indent current line to previous tab stop."
   (interactive)
-  (let  ((bol (save-excursion (progn (beginning-of-line) (point))))
-         (eol (save-excursion (progn (end-of-line) (point)))))
-    (indent-rigidly bol eol  (- 0 ada-indent))))
+  (let ((bol (save-excursion (progn (beginning-of-line) (point))))
+        (eol (save-excursion (progn (end-of-line) (point)))))
+    (indent-rigidly bol eol (- 0 ada-indent))))
 
 
 
@@ -4217,7 +4217,7 @@ of the region.  Otherwise, operate only on the current line."
 
 ;;  Not needed any more for Emacs 21.2, but still needed for backward
 ;;  compatibility
-(defun ada-remove-trailing-spaces  ()
+(defun ada-remove-trailing-spaces ()
   "Remove trailing spaces in the whole buffer."
   (interactive)
   (save-match-data
@@ -4904,7 +4904,7 @@ or the spec otherwise."
   (let ((is-spec nil)
         (is-body nil)
         (suffixes ada-spec-suffixes)
-        (name  (buffer-file-name)))
+        (name (buffer-file-name)))
 
     ;;  Guess whether we have a spec or a body, and get the basename of the
     ;;  file. Since the extension may not start with '.', we can not use
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 3264e0e72f6..26bbb8f3faf 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -445,12 +445,8 @@ Font for POD headers."
 ;;; Some double-evaluation happened with font-locks...  Needed with 21.2...
 (defvar cperl-singly-quote-face cperl-xemacs-p)
 
-(defcustom cperl-invalid-face           ; Does not customize with '' on XEmacs
-  (if cperl-singly-quote-face
-      'underline ''underline) ; On older Emacsen was evaluated by `font-lock'
-  (if cperl-singly-quote-face
-      "*This face is used for highlighting trailing whitespace."
-    "*Face for highlighting trailing whitespace.")
+(defcustom cperl-invalid-face 'underline
+  "*Face for highlighting trailing whitespace."
   :type 'face
   :version "21.1"
   :group 'cperl-faces)
@@ -1835,7 +1831,7 @@ or as help on variables `cperl-tips', `cperl-problems',
   (if (boundp 'font-lock-multiline)     ; Newer font-lock; use its facilities
       (progn
         (setq cperl-font-lock-multiline t) ; Not localized...
-        (set 'font-lock-multiline t)) ; not present with old Emacs; auto-local
+        (set (make-local-variable 'font-lock-multiline) t))
     (make-local-variable 'font-lock-fontify-region-function)
     (set 'font-lock-fontify-region-function ; not present with old Emacs
          'cperl-font-lock-fontify-region-function))
@@ -5708,19 +5704,22 @@ indentation and initial hashes.  Behaves usually outside of comment."
 
 (defun cperl-windowed-init ()
   "Initialization under windowed version."
-  (if (or (featurep 'ps-print) cperl-faces-init)
-      ;; Need to init anyway:
-      (or cperl-faces-init (cperl-init-faces))
-    (add-hook 'font-lock-mode-hook
-              (function
-               (lambda ()
-                 (if (memq major-mode '(perl-mode cperl-mode))
-                     (progn
-                       (or cperl-faces-init (cperl-init-faces)))))))
-    (if (fboundp 'eval-after-load)
-        (eval-after-load
-            "ps-print"
-          '(or cperl-faces-init (cperl-init-faces))))))
+  (cond ((featurep 'ps-print)
+         (unless cperl-faces-init
+           (if (boundp 'font-lock-multiline)
+               (setq cperl-font-lock-multiline t))
+           (cperl-init-faces)))
+        ((not cperl-faces-init)
+         (add-hook 'font-lock-mode-hook
+                   (function
+                    (lambda ()
+                      (if (memq major-mode '(perl-mode cperl-mode))
+                          (progn
+                            (or cperl-faces-init (cperl-init-faces)))))))
+         (if (fboundp 'eval-after-load)
+             (eval-after-load
+                 "ps-print"
+               '(or cperl-faces-init (cperl-init-faces)))))))
 
 (defvar cperl-font-lock-keywords-1 nil
   "Additional expressions to highlight in Perl mode.  Minimal set.")
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 52360a73970..007033a87ba 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -2048,7 +2048,6 @@ static char *magick[] = {
                       (or gdb-stack-position
                           (setq gdb-stack-position (make-marker)))
                       (set-marker gdb-stack-position (point)))
-                  (set-marker gdb-stack-position nil)
                   (put-text-property bl (+ bl 4)
                                      'face '(:inverse-video t))))
               (when (re-search-forward
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index 863f972086e..0f20626c9b9 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -113,6 +113,9 @@ the regular expression `comint-prompt-regexp', a buffer local variable."
 (defvar inferior-octave-complete-impossible nil
   "Non-nil means that `inferior-octave-complete' is impossible.")
 
+(defvar inferior-octave-has-built-in-variables nil
+  "Non-nil means that Octave has built-in variables.")
+
 (defvar inferior-octave-dynamic-complete-functions
   '(inferior-octave-complete comint-dynamic-complete-filename)
   "List of functions called to perform completion for inferior Octave.
@@ -218,11 +221,20 @@ startup file, `~/.emacs-octave'."
                    'identity inferior-octave-output-list "\n")
                   "\n"))))
 
+     ;; Find out whether Octave has built-in variables.
+     (inferior-octave-send-list-and-digest
+      (list "exist \"LOADPATH\"\n"))
+     (setq inferior-octave-has-built-in-variables
+          (string-match "101$" (car inferior-octave-output-list)))
+
     ;; An empty secondary prompt, as e.g. obtained by '--braindead',
     ;; means trouble.
     (inferior-octave-send-list-and-digest (list "PS2\n"))
-    (if (string-match "^PS2 = *$" (car inferior-octave-output-list))
-        (inferior-octave-send-list-and-digest (list "PS2 = \"> \"\n")))
+    (if (string-match "\\(PS2\\|ans\\) = *$" (car inferior-octave-output-list))
+        (inferior-octave-send-list-and-digest
+         (list (if inferior-octave-has-built-in-variables
+                   "PS2 = \"> \"\n"
+                 "PS2 (\"> \");\n"))))
 
     ;; O.k., now we are ready for the Inferior Octave startup commands.
     (let* (commands
@@ -230,10 +242,12 @@ startup file, `~/.emacs-octave'."
            (file (or inferior-octave-startup-file
                           (concat "~/.emacs-" program))))
       (setq commands
-            (list "page_screen_output = 0;\n"
+            (list "more off;\n"
                   (if (not (string-equal
                             inferior-octave-output-string ">> "))
-                      "PS1=\"\\\\s> \";\n")
+                      (if inferior-octave-has-built-in-variables
+                          "PS1=\"\\\\s> \";\n"
+                        "PS1 (\"\\\\s> \");\n"))
                   (if (file-exists-p file)
                       (format "source (\"%s\");\n" file))))
       (inferior-octave-send-list-and-digest commands))
@@ -383,7 +397,7 @@ Use \\[inferior-octave-resync-dirs] to resync if Emacs gets confused."
 This command queries the inferior Octave process about its current
 directory and makes this the current buffer's default directory."
   (interactive)
-  (inferior-octave-send-list-and-digest '("pwd\n"))
+  (inferior-octave-send-list-and-digest '("disp (pwd ())\n"))
   (cd (car inferior-octave-output-list)))
 
 ;;; provide ourself
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0387c05134e..4d9a49a6b8d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1969,6 +1969,13 @@ Repeating the command scrolls the completion window."
 
 ;;;; Skeletons
 
+(defcustom python-use-skeletons nil
+  "Non-nil means template skeletons will be automagically inserted.
+This happens when pressing \"if<SPACE>\", for example, to prompt for
+the if condition."
+  :type 'boolean
+  :group 'python)
+
 (defvar python-skeletons nil
   "Alist of named skeletons for Python mode.
 Elements are of the form (NAME . EXPANDER-FUNCTION).")
@@ -1986,7 +1993,8 @@ The default contents correspond to the elements of `python-skeletons'.")
          (function (intern (concat "python-insert-" name))))
     `(progn
        (add-to-list 'python-skeletons ',(cons name function))
-       (define-abbrev python-mode-abbrev-table ,name "" ',function nil t)
+       (if python-use-skeletons
+           (define-abbrev python-mode-abbrev-table ,name "" ',function nil t))
        (define-skeleton ,function
          ,(format "Insert Python \"%s\" template." name)
          ,@elements)))))