aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-05-23 09:16:17 +0000
committerJuanma Barranquero2005-05-23 09:16:17 +0000
commita4632380faae651c8cbf322dc90d81aab1e01688 (patch)
tree0e68448c4fbb7569a5a65a176fb11e0855a3bbb5
parent33f413db2faf2139342191d3aabeba41a7db331c (diff)
downloademacs-a4632380faae651c8cbf322dc90d81aab1e01688.tar.gz
emacs-a4632380faae651c8cbf322dc90d81aab1e01688.zip
(c-guess-basic-syntax): Remove spurious call to `zerop'.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/cc-engine.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cdeafaa5a32..9eefd8afc2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12005-05-23 Juanma Barranquero <lekktu@gmail.com> 12005-05-23 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * progmodes/cc-engine.el (c-guess-basic-syntax):
4 Remove spurious call to `zerop'.
5
3 * emacs-lisp/cl.el (acons, pairlis): Add docstring. 6 * emacs-lisp/cl.el (acons, pairlis): Add docstring.
4 7
52005-05-23 Martin Stjernholm <bug-cc-mode@gnu.org> 82005-05-23 Martin Stjernholm <bug-cc-mode@gnu.org>
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 84538080219..e9ed474e792 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6109,7 +6109,7 @@ This function does not do any hidden buffer changes."
6109 (and c-overloadable-operators-regexp 6109 (and c-overloadable-operators-regexp
6110 (looking-at c-overloadable-operators-regexp) 6110 (looking-at c-overloadable-operators-regexp)
6111 (save-excursion 6111 (save-excursion
6112 (zerop (c-backward-token-2 1 nil lim)) 6112 (c-backward-token-2 1 nil lim)
6113 (looking-at "operator\\>[^_]")))))) 6113 (looking-at "operator\\>[^_]"))))))
6114 (or (memq (char-after) '(?, ?=)) 6114 (or (memq (char-after) '(?, ?=))
6115 (and (c-major-mode-is 'c++-mode) 6115 (and (c-major-mode-is 'c++-mode)