Merge from emacs-24; up to 2012-04-30T11:57:47Z!sdl.web@gmail.com

13 files changed, 113 insertions, 21 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f7feb62e0f1..117bbfc21c8 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * fixit.texi (Undo): Grammar fixes.  (Bug#11779)
+
+2012-06-29  Michael Witten  <mfwitten@gmail.com>  (tiny change)
+
+        * fixit.texi (Undo): Fix typo.  (Bug#11775)
+
 2012-06-27  Glenn Morris  <rgm@gnu.org>
 
         * ack.texi (Acknowledgments): Tiny update.
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 8f75c5e151c..b9199eba553 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -35,7 +35,7 @@ These were described earlier in this manual.  @xref{Erasing}.
   The @dfn{undo} command reverses recent changes in the buffer's text.
 Each buffer records changes individually, and the undo command always
 applies to the current buffer.  You can undo all the changes in a
-buffer for as far as back its records go.  Usually, each editing
+buffer for as far back as the buffer's records go.  Usually, each editing
 command makes a separate entry in the undo records, but some commands
 such as @code{query-replace} divide their changes into multiple
 entries for flexibility in undoing.  Consecutive character insertion
@@ -109,9 +109,9 @@ Emacs to hold text that users don't normally look at or edit.
 @vindex undo-strong-limit
 @vindex undo-outer-limit
 @cindex undo limit
-  When the undo records for a buffer becomes too large, Emacs discards
-the oldest undo records from time to time (during @dfn{garbage
-collection}).  You can specify how much undo records to keep by
+  When the undo information for a buffer becomes too large, Emacs discards
+the oldest records from time to time (during @dfn{garbage
+collection}).  You can specify how much undo information to keep by
 setting the variables @code{undo-limit}, @code{undo-strong-limit}, and
 @code{undo-outer-limit}.  Their values are expressed in bytes.
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 078352d78f4..4dd8585fc2c 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -255,6 +255,36 @@ result in an endless loop.
 If you need Emacs to be able to recover from closing displays, compile
 it with the Lucid toolkit instead of GTK.
 
+** Emacs crashes when you try to view a file with complex characters.
+For example, the etc/HELLO file (as shown by C-h h).
+The message "symbol lookup error: /usr/bin/emacs: undefined symbol: OTF_open"
+is shown in the terminal from which you launched Emacs.
+This problem only happens when you use a graphical display (ie not
+with -nw) and compiled Emacs with the "libotf" library for complex
+text handling.
+
+This problem occurs because unfortunately there are two libraries
+called "libotf".  One is the library for handling OpenType fonts,
+http://www.m17n.org/libotf/, which is the one that Emacs expects.
+The other is a library for Open Trace Format, and is used by some
+versions of the MPI message passing interface for parallel
+programming.
+
+For example, on RHEL6 GNU/Linux, the OpenMPI rpm provides a version
+of "libotf.so" in /usr/lib/openmpi/lib.  This directory is not
+normally in the ld search path, but if you want to use OpenMPI,
+you must issue the command "module load openmpi".  This adds
+/usr/lib/openmpi/lib to LD_LIBRARY_PATH.  If you then start Emacs from
+the same shell, you will encounter this crash.
+Ref: <URL:https://bugzilla.redhat.com/show_bug.cgi?id=806031>
+
+There is no good solution to this problem if you need to use both
+OpenMPI and Emacs with libotf support.  The best you can do is use a
+wrapper shell script (or function) "emacs" that removes the offending
+element from LD_LIBRARY_PATH before starting emacs proper.
+Or you could recompile Emacs with an -Wl,-rpath option that
+gives the location of the correct libotf.
+
 * General runtime problems
 
 ** Lisp problems
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e083b628cde..0f293be18c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,32 @@
+2012-06-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * calendar/cal-dst.el (calendar-current-time-zone):
+        Return calendar-current-time-zone-cache if non-nil.
+
+2012-06-29  Masatake YAMATO  <yamato@redhat.com>
+
+        * progmodes/which-func.el (which-func-format):
+        Add mouse-face.  (Bug#11698)
+
+2012-06-29  Leo Liu  <sdl.web@gmail.com>
+
+        * textmodes/enriched.el (enriched-next-annotation): Use eq (Bug#11528).
+
+2012-06-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (minibuffer-confirm-exit-commands):
+        Add completion-at-point (bug#11725).
+
+2012-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/f90.el (f90-font-lock-keywords-2):
+        Add some preprocessor elements.  (Bug#10499)
+
+2012-06-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/cperl-mode.el (cperl-update-syntaxification):
+        Use syntax-propertize (bug#11739).
+
 2012-06-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811).
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index e3996cae3de..4af3ea53ab3 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -347,8 +347,8 @@ DST-ZONE are equal, and all the DST-* integer variables are 0.
 Some operating systems cannot provide all this information to Emacs; in this
 case, `calendar-current-time-zone' returns a list containing nil for the data
 it can't find."
-  (unless calendar-current-time-zone-cache
-    (setq calendar-current-time-zone-cache (calendar-dst-find-data))))
+  (or calendar-current-time-zone-cache
+      (setq calendar-current-time-zone-cache (calendar-dst-find-data))))
 
 
 ;; Following options should be set based on conditions when the code
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index e5151cd8148..e20106e1098 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1136,7 +1136,8 @@ Repeated uses step through the possible completions."
         (completion--cache-all-sorted-completions (cdr all)))))))
 
 (defvar minibuffer-confirm-exit-commands
-  '(minibuffer-complete minibuffer-complete-word PC-complete PC-complete-word)
+  '(completion-at-point minibuffer-complete
+    minibuffer-complete-word PC-complete PC-complete-word)
   "A list of commands which cause an immediately following
 `minibuffer-complete-and-exit' to ask for extra confirmation.")
 
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index e95b6fa288d..f0499424952 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -8950,14 +8950,15 @@ do extra unwind via `cperl-unwind-to-safe'."
       (setq cperl-syntax-done-to (min cperl-syntax-done-to beg))))
 
 (defun cperl-update-syntaxification (from to)
-  (if (and cperl-use-syntax-table-text-property
-           cperl-syntaxify-by-font-lock
-           (or (null cperl-syntax-done-to)
-               (< cperl-syntax-done-to to)))
-      (progn
-        (save-excursion
-          (goto-char from)
-          (cperl-fontify-syntaxically to)))))
+  (cond
+   ((not cperl-use-syntax-table-text-property) nil)
+   ((fboundp 'syntax-propertize) (syntax-propertize to))
+   ((and cperl-syntaxify-by-font-lock
+         (or (null cperl-syntax-done-to)
+             (< cperl-syntax-done-to to)))
+    (save-excursion
+      (goto-char from)
+      (cperl-fontify-syntaxically to)))))
 
 (defvar cperl-version
   (let ((v  "Revision: 6.2"))
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 712725ffaf0..cc1251f6a75 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -233,6 +233,7 @@
   :safe  'stringp
   :group 'f90-indent)
 
+;; Should we add ^# to this?  That's not really a comment.
 (defcustom f90-directive-comment-re "!hpf\\$"
   "Regexp of comment-like directive like \"!HPF\\\\$\", not to be indented."
   :type  'regexp
@@ -627,7 +628,14 @@ logical\\|double[ \t]*precision\\|type[ \t]*(\\sw+)\\|none\\)[ \t]*"
     '("\\<\\(do\\|go[ \t]*to\\)\\>[ \t]*\\([0-9]+\\)"
       (1 font-lock-keyword-face) (2 font-lock-constant-face))
     ;; Line numbers (lines whose first character after number is letter).
-    '("^[ \t]*\\([0-9]+\\)[ \t]*[a-z]+" (1 font-lock-constant-face t))))
+    '("^[ \t]*\\([0-9]+\\)[ \t]*[a-z]+" (1 font-lock-constant-face t))
+    ;; Override eg for "#include".
+    '("^#[ \t]*\\w+" (0 font-lock-preprocessor-face t)
+      ("\\<defined\\>" nil nil (0 font-lock-preprocessor-face)))
+    '("^#" ("\\(&&\\|||\\)" nil nil (0 font-lock-constant-face t)))
+    '("^#[ \t]*define[ \t]+\\(\\w+\\)(" (1 font-lock-function-name-face))
+    '("^#[ \t]*define[ \t]+\\(\\w+\\)" (1 font-lock-variable-name-face))
+    '("^#[ \t]*include[ \t]+\\(<.+>\\)" (1 font-lock-string-face))))
   "Highlights declarations, do-loops and other constructs.")
 
 (defvar f90-font-lock-keywords-3
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index d5c8a1c6792..02948b35fe0 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -144,12 +144,13 @@ Zero means compute the Imenu menu regardless of size."
     (:propertize which-func-current
                  local-map ,which-func-keymap
                  face which-func
-                 ;;mouse-face highlight ; currently not evaluated :-(
+                 mouse-face mode-line-highlight
                  help-echo "mouse-1: go to beginning\n\
 mouse-2: toggle rest visibility\n\
 mouse-3: go to end")
     "]")
   "Format for displaying the function in the mode line."
+  :version "24.2"                       ; added mouse-face
   :group 'which-func
   :type 'sexp)
 ;;;###autoload (put 'which-func-format 'risky-local-variable t)
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 68a99b0efe4..a28fcfc7e4b 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -437,7 +437,7 @@ Return value is \(begin end name positive-p), or nil if none was found."
               (progn (goto-char (match-beginning 0))
                      (not (looking-at enriched-annotation-regexp))))
     (forward-char 1)
-    (if (= ?< (char-after (point)))
+    (if (eq ?< (char-after (point)))
         (delete-char 1)
       ;; A single < that does not start an annotation is an error,
       ;; which we note and then ignore.
diff --git a/src/ChangeLog b/src/ChangeLog
index 09fc8fbfda2..29fc2561c03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * gnutls.c (emacs_gnutls_handshake):
+        Add QUIT to make the loop interruptible.
+
+2012-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * charset.c (init_charset): Make lack of etc/charsets fatal.
+
 2012-06-29  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * editfns.c (region_limit): Fix type mismatch.
diff --git a/src/charset.c b/src/charset.c
index 8ce972ebf37..04de8a44b4c 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2296,11 +2296,15 @@ init_charset (void)
   tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory);
   if (access (SSDATA (tempdir), 0) < 0)
     {
-      dir_warning ("Error: charsets directory (%s) does not exist.\n\
+      /* This used to be non-fatal (dir_warning), but it should not
+         happen, and if it does sooner or later it will cause some
+         obscure problem (eg bug#6401), so better abort.  */
+      fprintf (stderr, "Error: charsets directory not found:\n\
+%s\n\
 Emacs will not function correctly without the character map files.\n\
 Please check your installation!\n",
-                   tempdir);
-      /* TODO should this be a fatal error?  (Bug#909)  */
+                   SDATA (tempdir));
+      exit (1);
     }
 
   Vcharset_map_path = Fcons (tempdir, Qnil);
diff --git a/src/gnutls.c b/src/gnutls.c
index c5e21cc8777..9c96379ff7e 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -322,6 +322,7 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
     {
       ret = fn_gnutls_handshake (state);
       emacs_gnutls_handle_error (state, ret);
+      QUIT;
     }
   while (ret < 0 && fn_gnutls_error_is_fatal (ret) == 0);