Commit f5695c9a authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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.
parent 45fd731c
2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
   
* 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 * textmodes/tex-mode.el (tex-font-lock-keywords-1): Highlight not only
$$..$$ but also $..$ using regexps (bug#11953). $$..$$ but also $..$ using regexps (bug#11953).
Use tex-verbatim for \url and \path. Use tex-verbatim for \url and \path.
......
...@@ -274,7 +274,7 @@ be skipped; if nil, as is usual, `macroexp-const-p' is used." ...@@ -274,7 +274,7 @@ be skipped; if nil, as is usual, `macroexp-const-p' is used."
(expsym (make-symbol "exp"))) (expsym (make-symbol "exp")))
`(let* ((,expsym ,exp) `(let* ((,expsym ,exp)
(,var (if (funcall #',(or test #'macroexp-const-p) ,expsym) (,var (if (funcall #',(or test #'macroexp-const-p) ,expsym)
,expsym (make-symbol "x"))) ,expsym (make-symbol ,(symbol-name var))))
(,bodysym ,(macroexp-progn exps))) (,bodysym ,(macroexp-progn exps)))
(if (eq ,var ,expsym) ,bodysym (if (eq ,var ,expsym) ,bodysym
(macroexp-let* (list (list ,var ,expsym)) (macroexp-let* (list (list ,var ,expsym))
......
...@@ -78,13 +78,13 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." ...@@ -78,13 +78,13 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
;; Retrieve the expected preface for the up-event. ;; Retrieve the expected preface for the up-event.
(unless is-click (unless is-click
(unless (cond ((null extension) (unless (cond ((null extension)
(and (eq (read-char) ?\e) (and (eq (read-event) ?\e)
(eq (read-char) ?\[) (eq (read-event) ?\[)
(eq (read-char) ?M))) (eq (read-event) ?M)))
((eq extension 1006) ((eq extension 1006)
(and (eq (read-char) ?\e) (and (eq (read-event) ?\e)
(eq (read-char) ?\[) (eq (read-event) ?\[)
(eq (read-char) ?<)))) (eq (read-event) ?<))))
(error "Unexpected escape sequence from XTerm"))) (error "Unexpected escape sequence from XTerm")))
;; Process the up-event. ;; Process the up-event.
...@@ -139,7 +139,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." ...@@ -139,7 +139,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
(defun xterm-mouse-event-read () (defun xterm-mouse-event-read ()
;; We get the characters decoded by the keyboard coding system. Try ;; We get the characters decoded by the keyboard coding system. Try
;; to recover the raw character. ;; to recover the raw character.
(let ((c (read-char))) (let ((c (read-event)))
(cond ;; If meta-flag is t we get a meta character (cond ;; If meta-flag is t we get a meta character
((>= c ?\M-\^@) ((>= c ?\M-\^@)
(- c (- ?\M-\^@ 128))) (- c (- ?\M-\^@ 128)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment