diff options
| author | Chong Yidong | 2006-02-15 02:35:20 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-02-15 02:35:20 +0000 |
| commit | 16f18d05e54a74d8ce789ecf61803c85717f1ac4 (patch) | |
| tree | bb892ab370eab22223eded3e03ad26c4f362391f | |
| parent | 252293378b1467cd6dda2e69154fed991e6a6e8a (diff) | |
| download | emacs-16f18d05e54a74d8ce789ecf61803c85717f1ac4.tar.gz emacs-16f18d05e54a74d8ce789ecf61803c85717f1ac4.zip | |
* gnus-cus.el: Revert 2005-10-17 change.
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-cus.el | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index be9436d350c..5a925f18adc 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-02-14 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * gnus-cus.el: Revert 2005-10-17 change. | ||
| 4 | |||
| 1 | 2006-02-10 Reiner Steib <Reiner.Steib@gmx.de> | 5 | 2006-02-10 Reiner Steib <Reiner.Steib@gmx.de> |
| 2 | 6 | ||
| 3 | * gnus.el: Remove bogus comment. | 7 | * gnus.el: Remove bogus comment. |
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el index fdce8d1b665..5acad8f721b 100644 --- a/lisp/gnus/gnus-cus.el +++ b/lisp/gnus/gnus-cus.el | |||
| @@ -36,14 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | ;;; Widgets: | 37 | ;;; Widgets: |
| 38 | 38 | ||
| 39 | (defvar gnus-custom-map | ||
| 40 | (let ((map (make-keymap))) | ||
| 41 | (set-keymap-parent map widget-keymap) | ||
| 42 | (suppress-keymap map) | ||
| 43 | (define-key map [mouse-1] 'widget-move-and-invoke) | ||
| 44 | map) | ||
| 45 | "Keymap for editing Gnus customization buffers.") | ||
| 46 | |||
| 47 | (defun gnus-custom-mode () | 39 | (defun gnus-custom-mode () |
| 48 | "Major mode for editing Gnus customization buffers. | 40 | "Major mode for editing Gnus customization buffers. |
| 49 | 41 | ||
| @@ -59,7 +51,7 @@ if that value is non-nil." | |||
| 59 | (kill-all-local-variables) | 51 | (kill-all-local-variables) |
| 60 | (setq major-mode 'gnus-custom-mode | 52 | (setq major-mode 'gnus-custom-mode |
| 61 | mode-name "Gnus Customize") | 53 | mode-name "Gnus Customize") |
| 62 | (use-local-map gnus-custom-map) | 54 | (use-local-map widget-keymap) |
| 63 | ;; Emacs 21 stuff: | 55 | ;; Emacs 21 stuff: |
| 64 | (when (and (facep 'custom-button-face) | 56 | (when (and (facep 'custom-button-face) |
| 65 | (facep 'custom-button-pressed-face)) | 57 | (facep 'custom-button-pressed-face)) |
| @@ -490,7 +482,7 @@ form, but who cares?" | |||
| 490 | (widget-create 'sexp | 482 | (widget-create 'sexp |
| 491 | :tag "Method" | 483 | :tag "Method" |
| 492 | :value (gnus-info-method info)))) | 484 | :value (gnus-info-method info)))) |
| 493 | (use-local-map gnus-custom-map) | 485 | (use-local-map widget-keymap) |
| 494 | (widget-setup) | 486 | (widget-setup) |
| 495 | (buffer-enable-undo) | 487 | (buffer-enable-undo) |
| 496 | (goto-char (point-min)))) | 488 | (goto-char (point-min)))) |
| @@ -884,7 +876,7 @@ articles in the thread. | |||
| 884 | '(repeat :inline t | 876 | '(repeat :inline t |
| 885 | :tag "Unknown entries" | 877 | :tag "Unknown entries" |
| 886 | sexp))) | 878 | sexp))) |
| 887 | (use-local-map gnus-custom-map) | 879 | (use-local-map widget-keymap) |
| 888 | (widget-setup))) | 880 | (widget-setup))) |
| 889 | 881 | ||
| 890 | (defun gnus-score-customize-done (&rest ignore) | 882 | (defun gnus-score-customize-done (&rest ignore) |
| @@ -1061,7 +1053,7 @@ articles in the thread. | |||
| 1061 | 1053 | ||
| 1062 | (gnus-agent-cat-prepare-category-field agent-enable-undownloaded-faces) | 1054 | (gnus-agent-cat-prepare-category-field agent-enable-undownloaded-faces) |
| 1063 | 1055 | ||
| 1064 | (use-local-map gnus-custom-map) | 1056 | (use-local-map widget-keymap) |
| 1065 | (widget-setup) | 1057 | (widget-setup) |
| 1066 | (buffer-enable-undo)))) | 1058 | (buffer-enable-undo)))) |
| 1067 | 1059 | ||