[Emacs-diffs] /srv/bzr/emacs/trunk r109116: Misc minor changes.

[Stefan Monnier]

------------------------------------------------------------
revno: 109116
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-17 04:15:06 -0400
message:
  Misc minor changes.
  * lisp/xt-mouse.el (xterm-mouse-translate-1, xterm-mouse-event-read):
  Use read-event since we don't really want to read chars but bytes.
  * lisp/emacs-lisp/macroexp.el (macroexp-let2): Use more informative names
  for uninterned vars.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/macroexp.el
  lisp/xt-mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-17 08:11:31 +0000
+++ b/lisp/ChangeLog    2012-07-17 08:15:06 +0000
@@ -1,5 +1,11 @@
 2012-07-17  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/macroexp.el (macroexp-let2): Use more informative names
+       for uninterned vars.
+
+       * xt-mouse.el (xterm-mouse-translate-1, xterm-mouse-event-read):
+       Use read-event since we don't really want to read chars but bytes.
+
        * textmodes/tex-mode.el (tex-font-lock-keywords-1): Highlight not only
        $$..$$ but also $..$ using regexps (bug#11953).
        Use tex-verbatim for \url and \path.

=== modified file 'lisp/emacs-lisp/macroexp.el'
--- a/lisp/emacs-lisp/macroexp.el       2012-06-23 15:38:23 +0000
+++ b/lisp/emacs-lisp/macroexp.el       2012-07-17 08:15:06 +0000
@@ -274,7 +274,7 @@
         (expsym (make-symbol "exp")))
     `(let* ((,expsym ,exp)
             (,var (if (funcall #',(or test #'macroexp-const-p) ,expsym)
-                      ,expsym (make-symbol "x")))
+                      ,expsym (make-symbol ,(symbol-name var))))
             (,bodysym ,(macroexp-progn exps)))
        (if (eq ,var ,expsym) ,bodysym
          (macroexp-let* (list (list ,var ,expsym))

=== modified file 'lisp/xt-mouse.el'
--- a/lisp/xt-mouse.el  2012-07-14 15:40:12 +0000
+++ b/lisp/xt-mouse.el  2012-07-17 08:15:06 +0000
@@ -78,13 +78,13 @@
        ;; Retrieve the expected preface for the up-event.
        (unless is-click
          (unless (cond ((null extension)
-                        (and (eq (read-char) ?\e)
-                             (eq (read-char) ?\[)
-                             (eq (read-char) ?M)))
+                        (and (eq (read-event) ?\e)
+                             (eq (read-event) ?\[)
+                             (eq (read-event) ?M)))
                        ((eq extension 1006)
-                        (and (eq (read-char) ?\e)
-                             (eq (read-char) ?\[)
-                             (eq (read-char) ?<))))
+                        (and (eq (read-event) ?\e)
+                             (eq (read-event) ?\[)
+                             (eq (read-event) ?<))))
            (error "Unexpected escape sequence from XTerm")))
 
        ;; Process the up-event.
@@ -139,7 +139,7 @@
 (defun xterm-mouse-event-read ()
   ;; We get the characters decoded by the keyboard coding system.  Try
   ;; to recover the raw character.
-  (let ((c (read-char)))
+  (let ((c (read-event)))
     (cond ;; If meta-flag is t we get a meta character
          ((>= c ?\M-\^@)
           (- c (- ?\M-\^@ 128)))