From cd6ef82d85dcd34f98b2ae6cec97b495f9a4e8ca Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 12 Apr 2008 03:17:19 +0000 Subject: [PATCH] Move non-autoloaded define-obsolete-variable-alias calls for defcustoms not in dumped files before the associated defcustom. --- lisp/ChangeLog | 19 +++++++++++++++++++ lisp/desktop.el | 5 +++-- lisp/files.el | 2 +- lisp/hilit-chg.el | 18 +++++++----------- lisp/ibuffer.el | 8 ++++---- lisp/iswitchb.el | 3 ++- lisp/net/net-utils.el | 10 +++++----- lisp/pcvs-info.el | 6 ++++-- lisp/progmodes/gud.el | 11 ++++++----- lisp/recentf.el | 8 ++++---- lisp/speedbar.el | 6 +++--- 11 files changed, 58 insertions(+), 38 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9dd9bbd6df0..fc04082c002 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2008-04-12 Glenn Morris + + * calendar/cal-china.el (chinese-calendar-time-zone): + Mark obsolete name as risky too. + + * calendar/calendar.el (calendar-faces): New custom group. + (calendar-today, diary, holiday): Doc fix. Move to calendar-faces + group. + * calendar/diary-lib.el (diary-face, diary-anniversary, diary-time) + (diary-button): Doc fix. Move to calendar-faces group. + + * emacs-lisp/byte-run.el (define-obsolete-variable-alias): Doc fix. + * desktop.el, files.el, hilit-chg.el, ibuffer.el, iswitchb.el: + * pcvs-info.el, recentf.el, speedbar.el, calendar/cal-china.el: + * calendar/cal-hebrew.el, calendar/cal-x.el, calendar/calendar.el + * calendar/diary-lib.el, net/net-utils.el, progmodes/gud.el: + Move non-autoloaded define-obsolete-variable-alias calls for defcustoms + not in dumped files before the associated defcustom. + 2008-04-11 Johan Bockgård * minibuffer.el (lazy-completion-table): Fix debug spec. diff --git a/lisp/desktop.el b/lisp/desktop.el index d1f6d214e20..b126925c467 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -206,13 +206,14 @@ the normal hook `desktop-not-loaded-hook' is run." :group 'desktop :version "22.2") +(define-obsolete-variable-alias 'desktop-basefilename + 'desktop-base-file-name "22.1") + (defcustom desktop-base-file-name (convert-standard-filename ".emacs.desktop") "Name of file for Emacs desktop, excluding the directory part." :type 'file :group 'desktop) -(define-obsolete-variable-alias 'desktop-basefilename - 'desktop-base-file-name "22.1") (defcustom desktop-base-lock-name (convert-standard-filename ".emacs.desktop.lock") diff --git a/lisp/files.el b/lisp/files.el index a9beff39862..07b8a0688ff 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -404,6 +404,7 @@ The functions are called in the order given until one of them returns non-nil.") ;;;It is not useful to make this a local variable. ;;;(put 'find-file-hooks 'permanent-local t) +(define-obsolete-variable-alias 'find-file-hooks 'find-file-hook "22.1") (defcustom find-file-hook nil "List of functions to be called after a buffer is loaded from a file. The buffer's local variables (if any) will have been processed before the @@ -412,7 +413,6 @@ functions are called." :type 'hook :options '(auto-insert) :version "22.1") -(define-obsolete-variable-alias 'find-file-hooks 'find-file-hook "22.1") (defvar write-file-functions nil "List of functions to be called before writing out a buffer to a file. diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 99376e492f9..63009747d9d 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -219,6 +219,9 @@ ;; A (not very good) default list of colors to rotate through. ;; +(define-obsolete-variable-alias 'highlight-changes-colours + 'highlight-changes-colors "22.1") + (defcustom highlight-changes-colors (if (eq (frame-parameter nil 'background-mode) 'light) ;; defaults for light background: @@ -236,10 +239,6 @@ colors then use this, if you want fancier faces then set :type '(repeat color) :group 'highlight-changes) -(define-obsolete-variable-alias 'highlight-changes-colours - 'highlight-changes-colors "22.1") - - ;; When you invoke highlight-changes-mode, should highlight-changes-visible-mode ;; be on or off? @@ -260,6 +259,8 @@ When a buffer is in Highlight Changes mode the function ;; These are the strings displayed in the mode-line for the minor mode: +(define-obsolete-variable-alias 'highlight-changes-active-string + 'highlight-changes-visible-string "23.1") (defcustom highlight-changes-visible-string " +Chg" "The string used when in Highlight Changes mode and changes are visible. @@ -269,8 +270,8 @@ a string with a leading space." (const :tag "None" nil)) :group 'highlight-changes) -(define-obsolete-variable-alias 'highlight-changes-active-string - 'highlight-changes-visible-string "23.1") +(define-obsolete-variable-alias 'highlight-changes-passive-string + 'highlight-changes-invisible-string "23.1") (defcustom highlight-changes-invisible-string " -Chg" "The string used when in Highlight Changes mode and changes are hidden. @@ -280,11 +281,6 @@ a string with a leading space." (const :tag "None" nil)) :group 'highlight-changes) -(define-obsolete-variable-alias 'highlight-changes-passive-string - 'highlight-changes-invisible-string "23.1") - - - (defcustom highlight-changes-global-modes t "Determine whether a buffer is suitable for global Highlight Changes mode. diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 22c4f465e1d..4aafea04855 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -339,19 +339,19 @@ directory, like `default-directory'." :type 'regexp :group 'ibuffer) +(define-obsolete-variable-alias 'ibuffer-hooks 'ibuffer-hook "22.1") + (defcustom ibuffer-hook nil "Hook run when `ibuffer' is called." :type 'hook :group 'ibuffer) -(define-obsolete-variable-alias 'ibuffer-hooks - 'ibuffer-hook "22.1") + +(define-obsolete-variable-alias 'ibuffer-mode-hooks 'ibuffer-mode-hook "22.1") (defcustom ibuffer-mode-hook nil "Hook run upon entry into `ibuffer-mode'." :type 'hook :group 'ibuffer) -(define-obsolete-variable-alias 'ibuffer-mode-hooks - 'ibuffer-mode-hook "22.1") (defcustom ibuffer-load-hook nil "Hook run when Ibuffer is loaded." diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index 4e89659dc8d..b5242e1c2ad 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -353,11 +353,12 @@ See also `iswitchb-newbuffer'." :type 'boolean :group 'iswitchb) +(define-obsolete-variable-alias 'iswitchb-use-fonts 'iswitchb-use-faces "22.1") + (defcustom iswitchb-use-faces t "*Non-nil means use font-lock faces for showing first match." :type 'boolean :group 'iswitchb) -(define-obsolete-variable-alias 'iswitchb-use-fonts 'iswitchb-use-faces "22.1") (defcustom iswitchb-use-frame-buffer-list nil "*Non-nil means use the currently selected frame's buffer list." diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index f64d79cfd12..3c882a5f518 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -91,6 +91,8 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type '(repeat string)) +(define-obsolete-variable-alias 'ipconfig-program 'ifconfig-program "22.2") + (defcustom ifconfig-program (if (eq system-type 'windows-nt) "ipconfig" @@ -99,8 +101,6 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type 'string) -(define-obsolete-variable-alias 'ipconfig-program 'ifconfig-program "22.2") - (defcustom ifconfig-program-options (list (if (eq system-type 'windows-nt) @@ -115,15 +115,15 @@ These options can be used to limit how many ICMP packets are emitted." :type 'string :version "23.1") +(define-obsolete-variable-alias 'ipconfig-program-options + 'ifconfig-program-options "22.2") + (defcustom iwconfig-program-options nil "Options for the iwconfig program." :group 'net-utils :type '(repeat string) :version "23.1") -(define-obsolete-variable-alias 'ipconfig-program-options - 'ifconfig-program-options "22.2") - (defcustom netstat-program "netstat" "Program to print network statistics." :group 'net-utils diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index 65c2c242a9f..33f7c66dcc0 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el @@ -1,7 +1,8 @@ ;;; pcvs-info.el --- internal representation of a fileinfo entry ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +;; Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs @@ -41,13 +42,14 @@ ;;;; config variables ;;;; +(define-obsolete-variable-alias 'cvs-display-full-path 'cvs-display-full-name) + (defcustom cvs-display-full-name t "*Specifies how the filenames should be displayed in the listing. If non-nil, their full filename name will be displayed, else only the non-directory part." :group 'pcl-cvs :type '(boolean)) -(define-obsolete-variable-alias 'cvs-display-full-path 'cvs-display-full-name) (defcustom cvs-allow-dir-commit nil "*Allow `cvs-mode-commit' on directories. diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index c057cccffa7..3b825c99d62 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -3273,6 +3273,9 @@ Treats actions as defuns." (kill-local-variable 'gdb-define-alist) (remove-hook 'after-save-hook 'gdb-create-define-alist t)))) +(define-obsolete-variable-alias 'tooltip-gud-modes + 'gud-tooltip-modes "22.1") + (defcustom gud-tooltip-modes '(gud-mode c-mode c++-mode fortran-mode python-mode) "List of modes for which to enable GUD tooltips." @@ -3280,6 +3283,9 @@ Treats actions as defuns." :group 'gud :group 'tooltip) +(define-obsolete-variable-alias 'tooltip-gud-display + 'gud-tooltip-display "22.1") + (defcustom gud-tooltip-display '((eq (tooltip-event-buffer gud-tooltip-event) (marker-buffer gud-overlay-arrow-position))) @@ -3297,11 +3303,6 @@ only tooltips in the buffer containing the overlay arrow." :group 'gud :group 'tooltip) -(define-obsolete-variable-alias 'tooltip-gud-modes - 'gud-tooltip-modes "22.1") -(define-obsolete-variable-alias 'tooltip-gud-display - 'gud-tooltip-display "22.1") - ;;; Reacting on mouse movements (defun gud-tooltip-change-major-mode () diff --git a/lisp/recentf.el b/lisp/recentf.el index d1723969b3c..8324d3ade67 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -227,15 +227,15 @@ This item will replace the \"More...\" item." :group 'recentf :type 'boolean) +(define-obsolete-variable-alias 'recentf-menu-append-commands-p + 'recentf-menu-append-commands-flag + "22.1") + (defcustom recentf-menu-append-commands-flag t "Non-nil means to append command items to the menu." :group 'recentf :type 'boolean) -(define-obsolete-variable-alias 'recentf-menu-append-commands-p - 'recentf-menu-append-commands-flag - "22.1") - (defcustom recentf-auto-cleanup 'mode "Define when to automatically cleanup the recent list. The following values can be set: diff --git a/lisp/speedbar.el b/lisp/speedbar.el index cd24ae4749c..a851936ca2d 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -642,6 +642,9 @@ Created from `speedbar-ignored-directory-expressions' with the function Use the function `speedbar-add-ignored-directory-regexp', or customize the variable `speedbar-ignored-directory-expressions' to modify this variable.") +(define-obsolete-variable-alias 'speedbar-ignored-path-expressions + 'speedbar-ignored-directory-expressions) + (defcustom speedbar-ignored-directory-expressions '("[/\\]logs?[/\\]\\'") "*List of regular expressions matching directories speedbar will ignore. @@ -4133,9 +4136,6 @@ TEXT is the buffer's name, TOKEN and INDENT are unused." (define-obsolete-variable-alias 'speedbar-ignored-path-regexp 'speedbar-ignored-directory-regexp) -(define-obsolete-variable-alias 'speedbar-ignored-path-expressions - 'speedbar-ignored-directory-expressions) - (define-obsolete-function-alias 'speedbar-add-ignored-path-regexp 'speedbar-add-ignored-directory-regexp) -- 2.11.4.GIT