[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-defs.el

[Richard M. Stallman]

Index: emacs/lisp/progmodes/cc-defs.el
diff -c emacs/lisp/progmodes/cc-defs.el:1.21 
emacs/lisp/progmodes/cc-defs.el:1.22
*** emacs/lisp/progmodes/cc-defs.el:1.21        Tue Jul  8 19:21:04 2003
--- emacs/lisp/progmodes/cc-defs.el     Sat Jul 12 20:19:56 2003
***************
*** 972,978 ****
  variable `c-nonsymbol-key' is used to make the adornment.  The
  optional MODE specifies the language to get it in.  The default is the
  current language (taken from `c-buffer-is-cc-mode')."
!   (setq list (delete-duplicates list :test 'string-equal))
    (if list
        (let ((re (c-regexp-opt list)))
        ;; Add our own grouping parenthesis around re instead of
--- 972,982 ----
  variable `c-nonsymbol-key' is used to make the adornment.  The
  optional MODE specifies the language to get it in.  The default is the
  current language (taken from `c-buffer-is-cc-mode')."
!   (let (unique)
!     (dolist (elt list)
!       (unless (member elt unique)
!       (push elt unique)))
!     (setq list unique))
    (if list
        (let ((re (c-regexp-opt list)))
        ;; Add our own grouping parenthesis around re instead of
***************
*** 1326,1336 ****
        ;; are no file dependencies needed.
        (setq source-files (nreverse
                            ;; Reverse to get the right load order.
!                           (mapcan (lambda (elem)
!                                     (if (eq file (car elem))
!                                         nil ; Exclude our own file.
!                                       (list (car elem))))
!                                   (get sym 'source)))))
  
        ;; Spend some effort to make a compact call to
        ;; `c-get-lang-constant' since it will be compiled in.
--- 1330,1341 ----
        ;; are no file dependencies needed.
        (setq source-files (nreverse
                            ;; Reverse to get the right load order.
!                           (apply 'nconc
!                                  (mapcar (lambda (elem)
!                                            (if (eq file (car elem))
!                                                nil ; Exclude our own file.
!                                              (list (car elem))))
!                                          (get sym 'source))))))
  
        ;; Spend some effort to make a compact call to
        ;; `c-get-lang-constant' since it will be compiled in.