* lisp/cedet/semantic/fw.el (semantic-make-local-hook)

(semantic-mode-line-update): Simplify via CSE.

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index a01ce4c..cdfb357 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,12 +1,17 @@
+2012-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * semantic/fw.el (semantic-make-local-hook, semantic-mode-line-update):
+       Simplify via CSE.
+
 2012-11-16  David Engster  <deng@randomsample.de>
 
-       * semantic/symref/list.el (semantic-symref-symbol): Use
-       `semantic-complete-read-tag-project' instead of
+       * semantic/symref/list.el (semantic-symref-symbol):
+       Use `semantic-complete-read-tag-project' instead of
        `semantic-complete-read-tag-buffer-deep', since the latter is not
        working correctly.
 
-       * semantic/symref.el (semantic-symref-result-get-tags): Use
-       `find-buffer-visiting' to follow symbolic links.
+       * semantic/symref.el (semantic-symref-result-get-tags):
+       Use `find-buffer-visiting' to follow symbolic links.
 
        * semantic/fw.el (semantic-find-file-noselect): Always set
        `enable-local-variables' to `:safe' when loading files.

diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index 14ffc80..6dd8530 100644 (file)
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -122,15 +122,13 @@
     )
 
 
-  (if (and (not (featurep 'xemacs))
-          (>= emacs-major-version 21))
-      (defalias 'semantic-make-local-hook 'identity)
-    (defalias 'semantic-make-local-hook 'make-local-hook)
-    )
+  (defalias 'semantic-make-local-hook
+    (if (and (not (featurep 'xemacs))
+             (>= emacs-major-version 21))
+        #'identity  #'make-local-hook))
 
-  (if (featurep 'xemacs)
-      (defalias 'semantic-mode-line-update 'redraw-modeline)
-    (defalias 'semantic-mode-line-update 'force-mode-line-update))
+  (defalias 'semantic-mode-line-update
+    (if (featurep 'xemacs) #'redraw-modeline #'force-mode-line-update))
 
   ;; Since Emacs 22 major mode functions should use `run-mode-hooks' to
   ;; run major mode hooks.