Merge from trunk.

3 files changed, 46 insertions, 25 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62d7cc449ab..10570c2a878 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2011-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (what-cursor-position): Fix the display of the
+        character info for LRE, LRO, RLE, and RLO characters by appending
+        an invisible PDF.
+
+2011-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/timer.el (with-timeout): Make sure we cancel the timer
+        even in case of error; add debug spec; simplify data flow.
+        (with-timeout-handler): Remove.
+
 2011-10-12  Michael Albinus  <michael.albinus@gmx.de>
 
         Fix Bug#6019, Bug#9315.
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 0e007ff7176..706c6fd0ba3 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -402,10 +402,6 @@ This function returns a timer object which you can use in `cancel-timer'."
     (timer-activate-when-idle timer t)
     timer))
 
-(defun with-timeout-handler (tag)
-  "This is the timer function used for the timer made by `with-timeout'."
-  (throw tag 'timeout))
-
 (defvar with-timeout-timers nil
   "List of all timers used by currently pending `with-timeout' calls.")
 
@@ -417,24 +413,27 @@ event (such as keyboard input, input from subprocesses, or a certain time);
 if the program loops without waiting in any way, the timeout will not
 be detected.
 \n(fn (SECONDS TIMEOUT-FORMS...) BODY)"
-  (declare (indent 1))
+  (declare (indent 1) (debug ((form body) body)))
   (let ((seconds (car list))
-        (timeout-forms (cdr list)))
-    `(let ((with-timeout-tag (cons nil nil))
-           with-timeout-value with-timeout-timer
-           (with-timeout-timers with-timeout-timers))
-       (if (catch with-timeout-tag
-             (progn
-               (setq with-timeout-timer
-                     (run-with-timer ,seconds nil
-                                      'with-timeout-handler
-                                      with-timeout-tag))
-               (push with-timeout-timer with-timeout-timers)
-               (setq with-timeout-value (progn . ,body))
-               nil))
-           (progn . ,timeout-forms)
-         (cancel-timer with-timeout-timer)
-         with-timeout-value))))
+        (timeout-forms (cdr list))
+        (timeout (make-symbol "timeout")))
+    `(let ((-with-timeout-value-
+            (catch ',timeout
+              (let* ((-with-timeout-timer-
+                      (run-with-timer ,seconds nil
+                                      (lambda () (throw ',timeout ',timeout))))
+                     (with-timeout-timers
+                         (cons -with-timeout-timer- with-timeout-timers)))
+                (unwind-protect
+                    ,@body
+                  (cancel-timer -with-timeout-timer-))))))
+       ;; It is tempting to avoid the `if' altogether and instead run
+       ;; timeout-forms in the timer, just before throwing `timeout'.
+       ;; But that would mean that timeout-forms are run in the deeper
+       ;; dynamic context of the timer, with inhibit-quit set etc...
+       (if (eq -with-timeout-value- ',timeout)
+           (progn ,@timeout-forms)
+         -with-timeout-value-))))
 
 (defun with-timeout-suspend ()
   "Stop the clock for `with-timeout'.  Used by debuggers.
diff --git a/lisp/simple.el b/lisp/simple.el
index af6d855d9c0..6d0e7543549 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1050,6 +1050,16 @@ In addition, with prefix argument, show details about that character
 in *Help* buffer.  See also the command `describe-char'."
   (interactive "P")
   (let* ((char (following-char))
+         ;; If the character is one of LRE, LRO, RLE, RLO, it will
+         ;; start a directional embedding, which could completely
+         ;; disrupt the rest of the line (e.g., RLO will display the
+         ;; rest of the line right-to-left).  So we put an invisible
+         ;; PDF character after these characters, to end the
+         ;; embedding, which eliminates any effects on the rest of the
+         ;; line.
+         (pdf (if (memq char '(?\x202a ?\x202b ?\x202d ?\x202e))
+                  (propertize (string ?\x202c) 'invisible t)
+                ""))
          (beg (point-min))
          (end (point-max))
          (pos (point))
@@ -1109,18 +1119,18 @@ in *Help* buffer.  See also the command `describe-char'."
             ;; We show the detailed information about CHAR.
             (describe-char (point)))
         (if (or (/= beg 1) (/= end (1+ total)))
-            (message "Char: %s %s point=%d of %d (%d%%) <%d-%d> column=%d%s"
+            (message "Char: %s%s %s point=%d of %d (%d%%) <%d-%d> column=%d%s"
                      (if (< char 256)
                          (single-key-description char)
                        (buffer-substring-no-properties (point) (1+ (point))))
-                     encoding-msg pos total percent beg end col hscroll)
-          (message "Char: %s %s point=%d of %d (%d%%) column=%d%s"
+                     pdf encoding-msg pos total percent beg end col hscroll)
+          (message "Char: %s%s %s point=%d of %d (%d%%) column=%d%s"
                    (if enable-multibyte-characters
                        (if (< char 128)
                            (single-key-description char)
                          (buffer-substring-no-properties (point) (1+ (point))))
                      (single-key-description char))
-                   encoding-msg pos total percent col hscroll))))))
+                   pdf encoding-msg pos total percent col hscroll))))))
 
 ;; Initialize read-expression-map.  It is defined at C level.
 (let ((m (make-sparse-keymap)))