Commit 31e7b090 authored by Glenn Morris's avatar Glenn Morris
Browse files

Don't (re)define a basic custom widget in cc-vars

* lisp/progmodes/cc-vars.el (other): Emacs has this widget since at
least 21.1, so don't (re)define it.
parent 7225c832
2013-06-01 Glenn Morris <rgm@gnu.org> 2013-06-01 Glenn Morris <rgm@gnu.org>
   
* progmodes/cc-vars.el (other): Emacs has this widget since
at least 21.1, so don't (re)define it.
* eshell/em-cmpl.el (eshell-cmpl-initialize): * eshell/em-cmpl.el (eshell-cmpl-initialize):
Replace the obsolete alias pcomplete-arg-quote-list. Replace the obsolete alias pcomplete-arg-quote-list.
   
......
...@@ -51,14 +51,19 @@ ...@@ -51,14 +51,19 @@
;;; Helpers ;;; Helpers
;; This widget exists in newer versions of the Custom library
(or (get 'other 'widget-type) ;; Emacs has 'other since at least version 21.1.
(define-widget 'other 'sexp ;; FIXME this is probably broken, since the widget is defined
"Matches everything, but doesn't let the user edit the value. ;; in wid-edit, which this file does not load. So we will always
;; define the widget, even when we don't need to.
(when (featurep 'xemacs)
(or (get 'other 'widget-type)
(define-widget 'other 'sexp
"Matches everything, but doesn't let the user edit the value.
Useful as last item in a `choice' widget." Useful as last item in a `choice' widget."
:tag "Other" :tag "Other"
:format "%t%n" :format "%t%n"
:value 'other)) :value 'other)))
;; The next defun will supersede c-const-symbol. ;; The next defun will supersede c-const-symbol.
(eval-and-compile (eval-and-compile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment