procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc minor changes.

Browse source 
* 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.
This commit is contained in:
Stefan Monnier 2012-07-17 04:15:06 -04:00
parent 45fd731c4d
commit f5695c9afd
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,5 +1,11 @@
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
$$..$$ but also $..$ using regexps (bug#11953).
Use tex-verbatim for \url and \path.

2
lisp/emacs-lisp/macroexp.el
View file

@ -274,7 +274,7 @@ be skipped; if nil, as is usual, `macroexp-const-p' is used."
(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))

14
lisp/xt-mouse.el
View file

@ -78,13 +78,13 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
;; 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 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
(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)))