[Emacs-diffs] trunk r116518: lisp/emacs-lisp/gv.el: Avoid duplicating entries of defun-declaration-alist.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116518
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-21 20:01:19 +0100
message:
  lisp/emacs-lisp/gv.el: Avoid duplicating entries of defun-declaration-alist.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/gv.el          setf.el-20120531120738-6w8114hk2anryyud-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-21 17:45:26 +0000
+++ b/lisp/ChangeLog    2014-02-21 19:01:19 +0000
@@ -1,3 +1,8 @@
+2014-02-21  Juanma Barranquero  <address@hidden>
+
+       * emacs-lisp/gv.el: Avoid duplicating gv-expander and gv-setter in
+       defun-declarations-alist.
+
 2014-02-21  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/cl-macs.el (cl-define-compiler-macro): Add indent rule

=== modified file 'lisp/emacs-lisp/gv.el'
--- a/lisp/emacs-lisp/gv.el     2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/gv.el     2014-02-21 19:01:19 +0000
@@ -157,11 +157,13 @@
         (_ (message "Unknown %s declaration %S" symbol handler) nil))))
 
 ;;;###autoload
-(push `(gv-expander ,(apply-partially #'gv--defun-declaration 'gv-expander))
-      defun-declarations-alist)
+(or (assq 'gv-expander defun-declarations-alist)
+    (push `(gv-expander ,(apply-partially #'gv--defun-declaration 
'gv-expander))
+         defun-declarations-alist))
 ;;;###autoload
-(push `(gv-setter ,(apply-partially #'gv--defun-declaration 'gv-setter))
-      defun-declarations-alist)
+(or (assq 'gv-setter defun-declarations-alist)
+    (push `(gv-setter ,(apply-partially #'gv--defun-declaration 'gv-setter))
+         defun-declarations-alist))
 
 ;; (defmacro gv-define-expand (name expander)
 ;;   "Use EXPANDER to handle NAME as a generalized var.