aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-04-12 04:38:45 +0000
committerStefan Monnier2008-04-12 04:38:45 +0000
commitfb970f91df77e01d96f055d5d5f000080d7f8b88 (patch)
tree2ce84fefd467c2a4b6ddc060fa334bb490f55744
parentc3de239774f0b1f17219a456be0dd7f52f9be9ec (diff)
downloademacs-fb970f91df77e01d96f055d5d5f000080d7f8b88.tar.gz
emacs-fb970f91df77e01d96f055d5d5f000080d7f8b88.zip
(hif-factor): Handle unary minus.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/hideif.el4
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc04082c002..53b5713a1a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-04-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/hideif.el (hif-factor): Handle unary minus.
4
12008-04-12 Glenn Morris <rgm@gnu.org> 52008-04-12 Glenn Morris <rgm@gnu.org>
2 6
3 * calendar/cal-china.el (chinese-calendar-time-zone): 7 * calendar/cal-china.el (chinese-calendar-time-zone):
@@ -41,6 +45,8 @@
41 45
422008-04-11 Stefan Monnier <monnier@iro.umontreal.ca> 462008-04-11 Stefan Monnier <monnier@iro.umontreal.ca>
43 47
48 * progmodes/python.el (python-mode): Don't mess with hippie-expand.
49
44 * Makefile.in (bootstrap-prepare): Make tpu-edt.el writable as well. 50 * Makefile.in (bootstrap-prepare): Make tpu-edt.el writable as well.
45 51
46 * textmodes/fill.el (fill-forward-paragraph-function): New var. 52 * textmodes/fill.el (fill-forward-paragraph-function): New var.
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 5c9bf45e392..9f83d89532e 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -496,6 +496,10 @@ that form should be displayed.")
496 ((numberp hif-token) 496 ((numberp hif-token)
497 (prog1 hif-token (hif-nexttoken))) 497 (prog1 hif-token (hif-nexttoken)))
498 498
499 ;; Unary plus/minus.
500 ((memq hif-token '(hif-minus hif-plus))
501 (list (prog1 hif-token (hif-nexttoken)) 0 (hif-factor)))
502
499 (t ; identifier 503 (t ; identifier
500 (let ((ident hif-token)) 504 (let ((ident hif-token))
501 (if (memq ident '(or and)) 505 (if (memq ident '(or and))