15 files changed, 191 insertions, 109 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f74726a743..cf1d4f0d54e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port better to AIX (Bug#14258).
+        * configure.ac (CFLAGS): Append -O if the user did not specify CFLAGS,
+        we did not already infer an optimization option, and -O works.
+        AIX xlc needs -O, otherwise garbage collection doesn't work.
+
 2013-04-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         * make-dist: Do not distribute admin/unidata/Makefile.
diff --git a/configure.ac b/configure.ac
index b5ac2db9099..4a78a81df4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -615,10 +615,10 @@ AC_DEFUN([gl_THREADLIB])
 dnl Amongst other things, this sets AR and ARFLAGS.
 gl_EARLY
 
-# It's helpful to have C macros available to GDB, so prefer -g3 to -g
-# if -g3 works and the user does not specify CFLAGS.
-# This test must follow gl_EARLY; otherwise AC_LINK_IFELSE complains.
 if test "$ac_test_CFLAGS" != set; then
+  # It's helpful to have C macros available to GDB, so prefer -g3 to -g
+  # if -g3 works and the user does not specify CFLAGS.
+  # This test must follow gl_EARLY; otherwise AC_LINK_IFELSE complains.
   case $CFLAGS in
     '-g')
       emacs_g3_CFLAGS='-g3';;
@@ -634,13 +634,29 @@ if test "$ac_test_CFLAGS" != set; then
       [emacs_cv_prog_cc_g3],
       [AC_LINK_IFELSE([AC_LANG_PROGRAM()],
          [emacs_cv_prog_cc_g3=yes],
-         [emacs_cv_prog_cc_g3=no])])
-    if test $emacs_cv_prog_cc_g3 = yes; then
-      CFLAGS=$emacs_g3_CFLAGS
-    else
+         [emacs_cv_prog_cc_g3=no])])
+    if test $emacs_cv_prog_cc_g3 != yes; then
       CFLAGS=$emacs_save_CFLAGS
     fi
   fi
+
+  case $CFLAGS in
+    *-O*) ;;
+    *)
+      # No optimization flag was inferred for this non-GCC compiler.
+      # Try -O.  This is needed for xlc on AIX; see Bug#14258.
+      emacs_save_CFLAGS=$CFLAGS
+      test -z "$CFLAGS" || CFLAGS="$CFLAGS "
+      CFLAGS=${CFLAGS}-O
+      AC_CACHE_CHECK([whether $CC accepts -O],
+        [emacs_cv_prog_cc_o],
+        [AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+           [emacs_cv_prog_cc_o=yes],
+           [emacs_cv_prog_cc_o=no])])
+      if test $emacs_cv_prog_cc_o != yes; then
+        CFLAGS=$emacs_save_CFLAGS
+      fi ;;
+  esac
 fi
 
 AC_ARG_ENABLE([gcc-warnings],
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7c374e1e96..c88cf1103bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,44 @@
+2013-04-26  Reuben Thomas  <rrt@sc3d.org>
+
+        * textmodes/remember.el (remember-store-in-files): document that
+        the file name format is fed through format-time-string.
+
+2013-04-26  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/octave.el (octave-sync-function-file-names): New function.
+        (octave-mode): Use it in before-save-hook.
+
+2013-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/tabulated-list.el (tabulated-list-mode): Disable undo
+        (bug#14274).
+
+        * progmodes/octave.el (octave-smie-forward-token): Properly skip
+        \n and comment, even if it's not an implicit ; (bug#14218).
+
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
+        * subr.el (read-number): Once more use `read' rather than
+        `string-to-number', to trap non-numeric input.  (Bug#14254)
+
+2013-04-26  Erik Charlebois  <erikcharlebois@gmail.com>
+
+        * emacs-lisp/syntax.el (syntax-propertize-multiline):
+        Use `syntax-multiline' text property consistently instead of
+        `font-lock-multiline'. (bug#14237).
+
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/shadow.el (list-load-path-shadows):
+        No longer necessary to check for duplicate simple.el, since
+        2012-07-07 change to init_lread to not include installation lisp
+        directories in load-path when running uninstalled.  (Bug#14270)
+
 2013-04-26  Leo Liu  <sdl.web@gmail.com>
 
         * progmodes/octave.el (octave-submit-bug-report): Obsolete.
         (octave-mode, inferior-octave-mode): Use setq-local.
-        (octave-not-in-string-or-comment-p): Renamed to
+        (octave-not-in-string-or-comment-p): Rename to
         octave-in-string-or-comment-p.
         (octave-in-comment-p, octave-in-string-p)
         (octave-in-string-or-comment-p): Replace defsubst with defun.
@@ -18,8 +54,8 @@
 
 2013-04-25  Leo Liu  <sdl.web@gmail.com>
 
-        * progmodes/octave.el (octave-completion-at-point-function): Make
-        use of inferior octave process.
+        * progmodes/octave.el (octave-completion-at-point-function):
+        Make use of inferior octave process.
         (octave-initialize-completions): Remove.
         (inferior-octave-completion-table): New function.
         (inferior-octave-completion-at-point): Use it.
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index b12fba17027..d0e3c5763b5 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -207,101 +207,79 @@ the earlier.
 
 For example, suppose `load-path' is set to
 
-\(\"/usr/gnu/emacs/site-lisp\" \"/usr/gnu/emacs/share/emacs/19.30/lisp\"\)
+\(\"/usr/share/emacs/site-lisp\" \"/usr/share/emacs/24.3/lisp\")
 
 and that each of these directories contains a file called XXX.el.  Then
 XXX.el in the site-lisp directory is referred to by all of:
-\(require 'XXX\), \(autoload .... \"XXX\"\), \(load-library \"XXX\"\) etc.
+\(require 'XXX), (autoload .... \"XXX\"), (load-library \"XXX\") etc.
 
-The first XXX.el file prevents Emacs from seeing the second \(unless
-the second is loaded explicitly via `load-file'\).
+The first XXX.el file prevents Emacs from seeing the second (unless
+the second is loaded explicitly via `load-file').
 
 When not intended, such shadowings can be the source of subtle
 problems.  For example, the above situation may have arisen because the
 XXX package was not distributed with versions of Emacs prior to
-19.30.  An Emacs maintainer downloaded XXX from elsewhere and installed
+24.3.  A system administrator downloaded XXX from elsewhere and installed
 it.  Later, XXX was updated and included in the Emacs distribution.
-Unless the Emacs maintainer checks for this, the new version of XXX
-will be hidden behind the old \(which may no longer work with the new
-Emacs version\).
+Unless the system administrator checks for this, the new version of XXX
+will be hidden behind the old (which may no longer work with the new
+Emacs version).
 
 This function performs these checks and flags all possible
 shadowings.  Because a .el file may exist without a corresponding .elc
-\(or vice-versa\), these suffixes are essentially ignored.  A file
-XXX.elc in an early directory \(that does not contain XXX.el\) is
+\(or vice-versa), these suffixes are essentially ignored.  A file
+XXX.elc in an early directory (that does not contain XXX.el) is
 considered to shadow a later file XXX.el, and vice-versa.
 
 Shadowings are located by calling the (non-interactive) companion
 function, `load-path-shadows-find'."
   (interactive)
-  (let* ((path (copy-sequence load-path))
-        (tem path)
-        toplevs)
-    ;; If we can find simple.el in two places,
-    (dolist (tt tem)
-      (if (or (file-exists-p (expand-file-name "simple.el" tt))
-              (file-exists-p (expand-file-name "simple.el.gz" tt)))
-          (setq toplevs (cons tt toplevs))))
-    (if (> (length toplevs) 1)
-        ;; Cut off our copy of load-path right before
-        ;; the last directory which has simple.el in it.
-        ;; This avoids loads of duplications between the source dir
-        ;; and the dir where these files were copied by installation.
-        (let ((break (car toplevs)))
-          (setq tem path)
-          (while tem
-            (if (eq (nth 1 tem) break)
-                (progn
-                  (setcdr tem nil)
-                  (setq tem nil)))
-            (setq tem (cdr tem)))))
-
-    (let* ((shadows (load-path-shadows-find path))
-           (n (/ (length shadows) 2))
-           (msg (format "%s Emacs Lisp load-path shadowing%s found"
-                        (if (zerop n) "No" (concat "\n" (number-to-string n)))
-                        (if (= n 1) " was" "s were"))))
-      (with-temp-buffer
-        (while shadows
-          (insert (format "%s hides %s\n" (car shadows)
-                          (car (cdr shadows))))
-          (setq shadows (cdr (cdr shadows))))
-        (if stringp
-            (buffer-string)
-          (if (called-interactively-p 'interactive)
-              ;; We are interactive.
-              ;; Create the *Shadows* buffer and display shadowings there.
-              (let ((string (buffer-string)))
-                (with-current-buffer (get-buffer-create "*Shadows*")
-                  (display-buffer (current-buffer))
-                  (load-path-shadows-mode) ; run after-change-major-mode-hook
-                  (let ((inhibit-read-only t))
-                    (erase-buffer)
-                    (insert string)
-                    (insert msg "\n")
-                    (while (re-search-backward "\\(^.*\\) hides \\(.*$\\)"
-                                               nil t)
-                      (dotimes (i 2)
-                        (make-button (match-beginning (1+ i))
-                                     (match-end (1+ i))
-                                     'type 'load-path-shadows-find-file
-                                     'shadow-file
-                                     (match-string (1+ i)))))
-                    (goto-char (point-max)))))
-            ;; We are non-interactive, print shadows via message.
-            (unless (zerop n)
-              (message "This site has duplicate Lisp libraries with the same name.
+  (let* ((shadows (load-path-shadows-find load-path))
+         (n (/ (length shadows) 2))
+         (msg (format "%s Emacs Lisp load-path shadowing%s found"
+                      (if (zerop n) "No" (concat "\n" (number-to-string n)))
+                      (if (= n 1) " was" "s were"))))
+    (with-temp-buffer
+      (while shadows
+        (insert (format "%s hides %s\n" (car shadows)
+                        (car (cdr shadows))))
+        (setq shadows (cdr (cdr shadows))))
+      (if stringp
+          (buffer-string)
+        (if (called-interactively-p 'interactive)
+            ;; We are interactive.
+            ;; Create the *Shadows* buffer and display shadowings there.
+            (let ((string (buffer-string)))
+              (with-current-buffer (get-buffer-create "*Shadows*")
+                (display-buffer (current-buffer))
+                (load-path-shadows-mode) ; run after-change-major-mode-hook
+                (let ((inhibit-read-only t))
+                  (erase-buffer)
+                  (insert string)
+                  (insert msg "\n")
+                  (while (re-search-backward "\\(^.*\\) hides \\(.*$\\)"
+                                             nil t)
+                    (dotimes (i 2)
+                      (make-button (match-beginning (1+ i))
+                                   (match-end (1+ i))
+                                   'type 'load-path-shadows-find-file
+                                   'shadow-file
+                                   (match-string (1+ i)))))
+                  (goto-char (point-max)))))
+          ;; We are non-interactive, print shadows via message.
+          (unless (zerop n)
+            (message "This site has duplicate Lisp libraries with the same name.
 If a locally-installed Lisp library overrides a library in the Emacs release,
 that can cause trouble, and you should probably remove the locally-installed
 version unless you know what you are doing.\n")
-              (goto-char (point-min))
-              ;; Mimic the previous behavior of using lots of messages.
-              ;; I think one single message would look better...
-              (while (not (eobp))
-                (message "%s" (buffer-substring (line-beginning-position)
-                                                (line-end-position)))
-                (forward-line 1))
-              (message "%s" msg))))))))
+            (goto-char (point-min))
+            ;; Mimic the previous behavior of using lots of messages.
+            ;; I think one single message would look better...
+            (while (not (eobp))
+              (message "%s" (buffer-substring (line-beginning-position)
+                                              (line-end-position)))
+              (forward-line 1))
+            (message "%s" msg)))))))
 
 (provide 'shadow)
 
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index bf2c8308bb5..0a4758a9ccd 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -99,7 +99,7 @@ Put first the functions more likely to cause a change and cheaper to compute.")
     (setq beg (or (previous-single-property-change beg 'syntax-multiline)
                   (point-min))))
   ;;
-  (when (get-text-property end 'font-lock-multiline)
+  (when (get-text-property end 'syntax-multiline)
     (setq end (or (text-property-any end (point-max)
                                      'syntax-multiline nil)
                   (point-max))))
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index da487e463e2..6dba423010f 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -519,12 +519,11 @@ printer is `tabulated-list-print-entry', but a mode that keeps
 data in an ewoc may instead specify a printer function (e.g., one
 that calls `ewoc-enter-last'), with `tabulated-list-print-entry'
 as the ewoc pretty-printer."
-  (setq truncate-lines t)
-  (setq buffer-read-only t)
-  (set (make-local-variable 'revert-buffer-function)
-       'tabulated-list-revert)
-  (set (make-local-variable 'glyphless-char-display)
-       tabulated-list-glyphless-char-display))
+  (setq-local truncate-lines t)
+  (setq-local buffer-read-only t)
+  (setq-local buffer-undo-list t)
+  (setq-local revert-buffer-function #'tabulated-list-revert)
+  (setq-local glyphless-char-display tabulated-list-glyphless-char-display))
 
 (put 'tabulated-list-mode 'mode-class 'special)
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 251e5b1f381..e10dd1e94c7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2013-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mail-source.el (mail-source-fetch-pop, mail-source-check-pop):
+        Don't set the MAILHOST environment variable permanently (Bug#14271).
+
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
+        * message.el (message-bury): Revert 2013-03-18 change.  (Bug#14117)
+
 2013-04-25  Andrew Cohen  <cohen@bu.edu>
 
         * gnus-msg.el (gnus-inews-insert-gcc): Re-order conditional to work for
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 9cc2e6ac09c..7da2a0a441d 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -809,6 +809,10 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
      prescript-delay)
     (let ((from (format "%s:%s:%s" server user port))
           (mail-source-string (format "pop:%s@%s" user server))
+          (process-environment (if server
+                                   (cons (concat "MAILHOST=" server)
+                                         process-environment)
+                                 process-environment))
           result)
       (when (eq authentication 'password)
         (setq password
@@ -816,8 +820,6 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
                   (cdr (assoc from mail-source-password-cache))
                   (read-passwd
                    (format "Password for %s at %s: " user server)))))
-      (when server
-        (setenv "MAILHOST" server))
       (setq result
             (cond
              (program
@@ -877,6 +879,10 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
   (mail-source-bind (pop source)
     (let ((from (format "%s:%s:%s" server user port))
           (mail-source-string (format "pop:%s@%s" user server))
+          (process-environment (if server
+                                   (cons (concat "MAILHOST=" server)
+                                         process-environment)
+                                 process-environment))
           result)
       (when (eq authentication 'password)
         (setq password
@@ -886,8 +892,6 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
                    (format "Password for %s at %s: " user server))))
         (unless (assoc from mail-source-password-cache)
           (push (cons from password) mail-source-password-cache)))
-      (when server
-        (setenv "MAILHOST" server))
       (setq result
             (cond
              ;; No easy way to check whether mail is waiting for these.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 2b2a0a94413..a6638097b47 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4097,9 +4097,11 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
-  (bury-buffer buffer)
-  (when message-return-action
-    (apply (car message-return-action) (cdr message-return-action))))
+  (if message-return-action
+      (progn
+        (bury-buffer buffer)
+        (apply (car message-return-action) (cdr message-return-action)))
+    (with-current-buffer buffer (bury-buffer))))
 
 (defun message-send (&optional arg)
   "Send the message in the current buffer.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 640775bfe8b..f8b9e4f6fab 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -461,11 +461,12 @@ Non-nil means always go to the next Octave code line after sending."
     (forward-comment 1))
   (cond
    ((and (looking-at "$\\|[%#]")
-         (not (smie-rule-bolp))
-         ;; Ignore it if it's within parentheses.
-         (prog1 (let ((ppss (syntax-ppss)))
-                  (not (and (nth 1 ppss)
-                            (eq ?\( (char-after (nth 1 ppss))))))
+         ;; Ignore it if it's within parentheses or if the newline does not end
+         ;; some preceding text.
+         (prog1 (and (not (smie-rule-bolp))
+                     (let ((ppss (syntax-ppss)))
+                       (not (and (nth 1 ppss)
+                                 (eq ?\( (char-after (nth 1 ppss)))))))
            (forward-comment (point-max))))
     ;; Why bother distinguishing \n and ;?
     ";") ;;"\n"
@@ -625,6 +626,7 @@ including a reproducible test case and send the message."
 
   (add-hook 'completion-at-point-functions
             'octave-completion-at-point-function nil t)
+  (add-hook 'before-save-hook 'octave-sync-function-file-names nil t)
   (setq-local beginning-of-defun-function 'octave-beginning-of-defun)
 
   (easy-menu-add octave-mode-menu))
@@ -1007,6 +1009,27 @@ directory and makes this the current buffer's default directory."
       nil
     (delete-horizontal-space)
     (insert (concat " " octave-continuation-string))))
+
+(defun octave-sync-function-file-names ()
+  "Ensure function name agree with function file name.
+See Info node `(octave)Function Files'."
+  (interactive)
+  (save-excursion
+    (when (and buffer-file-name
+               (prog2
+                   (goto-char (point-min))
+                   (equal (funcall smie-forward-token-function) "function")
+                 (forward-word -1)))
+      (let ((file (file-name-sans-extension
+                   (file-name-nondirectory buffer-file-name)))
+            (func (and (re-search-forward octave-function-header-regexp nil t)
+                       (match-string 3))))
+        (when (and func
+                   (not (equal file func))
+                   (yes-or-no-p
+                    "Function name different from file name. Fix? "))
+          (replace-match file nil nil nil 3))))))
+
 
 ;;; Indentation
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 7fe3d411580..523bec59b29 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2225,7 +2225,7 @@ The value of DEFAULT is inserted into PROMPT."
             (condition-case nil
                 (setq n (cond
                          ((zerop (length str)) default1)
-                         ((stringp str) (string-to-number str))))
+                         ((stringp str) (read str))))
               (error nil)))
           (unless (numberp n)
             (message "Please enter a number.")
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index ab085a3085a..a68a27bb07e 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -901,6 +901,7 @@ and the functions `TeX-current-macro' and
 `LaTeX-current-environment' are bound.  Also note that this
 feature might slow down the reftex parsing process for large TeX
 files."
+  :version "24.4"
   :group 'reftex-defining-label-environments
   :type '(repeat string))
 
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 76ffeaf30be..c8bafd8176a 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -444,7 +444,8 @@ If you want to remember a region, supply a universal prefix to
 
 (defun remember-store-in-files ()
   "Store remember data in a file in `remember-data-directory'.
-The file is named after `remember-directory-file-name-format'."
+The file is named after `remember-directory-file-name-format' fed through
+`format-time-string'."
   (let ((name (format-time-string
                remember-directory-file-name-format (current-time)))
         (text (buffer-string)))
diff --git a/src/ChangeLog b/src/ChangeLog
index 99e2c3d9a84..9ae5c29ab72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port better to AIX (Bug#14258).
+        * lisp.h (ENUM_BF) [__IBMC__]: Make it 'unsigned int' here, too,
+        to pacify AIX xlc.
+
 2013-04-24  Kenichi Handa  <handa@gnu.org>
 
         * coding.c (decode_coding_iso_2022): When an invalid escape
diff --git a/src/lisp.h b/src/lisp.h
index 175ec828c97..f7f8a5fb179 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -231,9 +231,9 @@ enum enum_USE_LSB_TAG { USE_LSB_TAG = 0 };
 #define case_Lisp_Int case Lisp_Int0: case Lisp_Int1
 #define LISP_INT_TAG_P(x) (((x) & ~Lisp_Int1) == 0)
 
-/* Stolen from GDB.  The only known compiler that doesn't support
-   enums in bitfields is MSVC.  */
-#ifdef _MSC_VER
+/* Idea stolen from GDB.  MSVC doesn't support enums in bitfields,
+   and xlc complains vociferously about them.  */
+#if defined _MSC_VER || defined __IBMC__
 #define ENUM_BF(TYPE) unsigned int
 #else
 #define ENUM_BF(TYPE) enum TYPE