Commit a5f2b6ec authored by Chong Yidong's avatar Chong Yidong

Remove several obsolete vars and functions unlikely to be still in use.

* lisp/vc/log-edit.el (cvs-changelog-full-paragraphs)
(cvs-commit-buffer-require-final-newline): Obsolete variables
removed.

* lisp/font-lock.el (font-lock-reference-face): Use
define-obsolete-variable-alias.

* lisp/international/mule.el (set-char-table-default): Remove.
(set-coding-priority, make-coding-system, generic-char-p)
(charset-list, charset-bytes, charset-id): Use declare to mark
obsolete.

* lisp/mail/supercite.el (sc-version): Remove obsolete function.
(sc-describe): Don't mark as obsolete, since it is bound.
(sc-submit-bug-report): Remove.

* lisp/progmodes/compile.el (compile-internal): Remove obsolete
function.
(compilation-parse-errors-function): Fix typo.

* lisp/vc/emerge.el (emerge-mode): Make it an obsolete alias.
(emerge-version): Remove.

* lisp/vc/pcvs-defs.el (cvs-buffer-name-alist)
(cvs-invert-ignore-marks): Remove references to obsolete vars.
* lisp/vc/vc-hooks.el (vc-default-registered): Don't use
vc-master-templates.

* lisp/vc/pcvs-defs.el (cvs-diff-buffer-name, cvs-diff-ignore-marks)
* lisp/vc/vc-hooks.el (vc-ignore-vc-files, vc-master-templates)
* lisp/vc/vc.el (vc-checkout-carefully): Likewise.

* src/chartab.c (Fset_char_table_default): Obsolete function removed.
parent 6c27f0f8
...@@ -660,6 +660,18 @@ are deprecated and will be removed eventually. ...@@ -660,6 +660,18 @@ are deprecated and will be removed eventually.
*** `facemenu-unlisted-faces' *** `facemenu-unlisted-faces'
*** `rmail-decode-mime-charset' *** `rmail-decode-mime-charset'
*** `last-input-char', `last-command-char', `unread-command-char'. *** `last-input-char', `last-command-char', `unread-command-char'.
*** `iswitchb-read-buffer'
*** `sc-version', `sc-submit-bug-report'
*** `set-char-table-default'
*** `compile-internal'
*** `cvs-commit-buffer-require-final-newline'
(use `'log-edit-require-final-newline'instead)
*** `cvs-changelog-full-paragraphs'
(use `log-edit-changelog-full-paragraphs' instead)
*** `cvs-diff-ignore-marks', `cvs-diff-buffer-name'
*** `vc-ignore-vc-files' (use `vc-handled-backends' instead)
*** `vc-master-templates' (use `vc-handled-backends' instead)
*** `vc-checkout-carefully'
* Lisp changes in Emacs 24.3 * Lisp changes in Emacs 24.3
......
2012-09-24 Chong Yidong <cyd@gnu.org> 2012-09-24 Chong Yidong <cyd@gnu.org>
* iswitchb.el (iswitchb-read-buffer): Move
iswitchb-define-mode-map code here, and delete that obsolete
function.
* mail/supercite.el (sc-version): Remove obsolete function.
(sc-describe): Don't mark as obsolete, since it is bound.
(sc-submit-bug-report): Remove.
* vc/log-edit.el (cvs-changelog-full-paragraphs)
(cvs-commit-buffer-require-final-newline): Remove.
* vc/pcvs-defs.el (cvs-diff-buffer-name, cvs-diff-ignore-marks)
* vc/vc-hooks.el (vc-ignore-vc-files, vc-master-templates)
* vc/vc.el (vc-checkout-carefully): Likewise.
* vc/emerge.el (emerge-mode): Make it an obsolete alias.
(emerge-version): Remove.
* progmodes/compile.el (compile-internal): Remove.
(compilation-parse-errors-function): Fix typo.
* international/mule.el (set-char-table-default): Remove.
(set-coding-priority, make-coding-system, generic-char-p)
(charset-list, charset-bytes, charset-id): Use declare to mark
functions as obsolete.
* vc/pcvs-defs.el (cvs-buffer-name-alist)
(cvs-invert-ignore-marks): Remove references to obsolete vars.
* vc/vc-hooks.el (vc-default-registered): Don't use
vc-master-templates.
* font-lock.el (font-lock-reference-face): Use * font-lock.el (font-lock-reference-face): Use
define-obsolete-variable-alias. define-obsolete-variable-alias.
......
...@@ -340,8 +340,8 @@ This can be an \"!\" or the \"n\" in \"ifndef\".") ...@@ -340,8 +340,8 @@ This can be an \"!\" or the \"n\" in \"ifndef\".")
(defvar font-lock-preprocessor-face 'font-lock-preprocessor-face (defvar font-lock-preprocessor-face 'font-lock-preprocessor-face
"Face name to use for preprocessor directives.") "Face name to use for preprocessor directives.")
(defvar font-lock-reference-face 'font-lock-constant-face) (define-obsolete-variable-alias
(make-obsolete-variable 'font-lock-reference-face 'font-lock-constant-face "20.3") 'font-lock-reference-face 'font-lock-constant-face "20.3")
;; Fontification variables: ;; Fontification variables:
......
...@@ -409,13 +409,13 @@ PLIST (property list) may contain any type of information a user ...@@ -409,13 +409,13 @@ PLIST (property list) may contain any type of information a user
(defun charset-id (charset) (defun charset-id (charset)
"Always return 0. This is provided for backward compatibility." "Always return 0. This is provided for backward compatibility."
(declare (obsolete nil "23.1"))
0) 0)
(make-obsolete 'charset-id "do not use it." "23.1")
(defmacro charset-bytes (charset) (defmacro charset-bytes (charset)
"Always return 0. This is provided for backward compatibility." "Always return 0. This is provided for backward compatibility."
(declare (obsolete nil "23.1"))
0) 0)
(make-obsolete 'charset-bytes "do not use it." "23.1")
(defun get-charset-property (charset propname) (defun get-charset-property (charset propname)
"Return the value of CHARSET's PROPNAME property. "Return the value of CHARSET's PROPNAME property.
...@@ -464,8 +464,8 @@ Return -1 if charset isn't an ISO 2022 one." ...@@ -464,8 +464,8 @@ Return -1 if charset isn't an ISO 2022 one."
(defun charset-list () (defun charset-list ()
"Return list of all charsets ever defined." "Return list of all charsets ever defined."
(declare (obsolete charset-list "23.1"))
charset-list) charset-list)
(make-obsolete 'charset-list "use variable `charset-list'." "23.1")
;;; CHARACTER ;;; CHARACTER
...@@ -473,8 +473,8 @@ Return -1 if charset isn't an ISO 2022 one." ...@@ -473,8 +473,8 @@ Return -1 if charset isn't an ISO 2022 one."
(defun generic-char-p (char) (defun generic-char-p (char)
"Always return nil. This is provided for backward compatibility." "Always return nil. This is provided for backward compatibility."
(declare (obsolete nil "23.1"))
nil) nil)
(make-obsolete 'generic-char-p "generic characters no longer exist." "23.1")
(defun make-char-internal (charset-id &optional code1 code2) (defun make-char-internal (charset-id &optional code1 code2)
(let ((charset (aref emacs-mule-charset-table charset-id))) (let ((charset (aref emacs-mule-charset-table charset-id)))
...@@ -1012,6 +1012,7 @@ Value is a list of transformed arguments." ...@@ -1012,6 +1012,7 @@ Value is a list of transformed arguments."
eol-type) eol-type)
"Define a new coding system CODING-SYSTEM (symbol). "Define a new coding system CODING-SYSTEM (symbol).
This function is provided for backward compatibility." This function is provided for backward compatibility."
(declare (obsolete define-coding-system "23.1"))
;; For compatibility with XEmacs, we check the type of TYPE. If it ;; For compatibility with XEmacs, we check the type of TYPE. If it
;; is a symbol, perhaps, this function is called with XEmacs-style ;; is a symbol, perhaps, this function is called with XEmacs-style
;; arguments. Here, try to transform that kind of arguments to ;; arguments. Here, try to transform that kind of arguments to
...@@ -1104,8 +1105,6 @@ This function is provided for backward compatibility." ...@@ -1104,8 +1105,6 @@ This function is provided for backward compatibility."
(apply 'define-coding-system coding-system doc-string properties)) (apply 'define-coding-system coding-system doc-string properties))
(make-obsolete 'make-coding-system 'define-coding-system "23.1")
(defun merge-coding-systems (first second) (defun merge-coding-systems (first second)
"Fill in any unspecified aspects of coding system FIRST from SECOND. "Fill in any unspecified aspects of coding system FIRST from SECOND.
Return the resulting coding system." Return the resulting coding system."
...@@ -1449,9 +1448,9 @@ This setting is effective for the next communication only." ...@@ -1449,9 +1448,9 @@ This setting is effective for the next communication only."
ARG is a list of coding categories ordered by priority. ARG is a list of coding categories ordered by priority.
This function is provided for backward compatibility." This function is provided for backward compatibility."
(declare (obsolete set-coding-system-priority "23.1"))
(apply 'set-coding-system-priority (apply 'set-coding-system-priority
(mapcar #'(lambda (x) (symbol-value x)) arg))) (mapcar #'(lambda (x) (symbol-value x)) arg)))
(make-obsolete 'set-coding-priority 'set-coding-system-priority "23.1")
;;; X selections ;;; X selections
...@@ -2356,9 +2355,6 @@ Analogous to `define-translation-table', but updates ...@@ -2356,9 +2355,6 @@ Analogous to `define-translation-table', but updates
(setq ignore-relative-composition (setq ignore-relative-composition
(make-char-table 'ignore-relative-composition)) (make-char-table 'ignore-relative-composition))
(make-obsolete 'set-char-table-default
"generic characters no longer exist." "23.1")
;;; Built-in auto-coding-functions: ;;; Built-in auto-coding-functions:
(defun sgml-xml-auto-coding-function (size) (defun sgml-xml-auto-coding-function (size)
......
...@@ -506,8 +506,6 @@ string." ...@@ -506,8 +506,6 @@ string."
;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
;; end user configuration variables ;; end user configuration variables
(define-obsolete-variable-alias 'sc-version 'emacs-version "23.1")
(defvar sc-mail-info nil (defvar sc-mail-info nil
"Alist of mail header information gleaned from reply buffer.") "Alist of mail header information gleaned from reply buffer.")
(defvar sc-attributions nil (defvar sc-attributions nil
...@@ -559,10 +557,8 @@ string." ...@@ -559,10 +557,8 @@ string."
(define-key map "r" 'sc-recite-region) (define-key map "r" 'sc-recite-region)
(define-key map "\C-p" 'sc-raw-mode-toggle) (define-key map "\C-p" 'sc-raw-mode-toggle)
(define-key map "u" 'sc-uncite-region) (define-key map "u" 'sc-uncite-region)
(define-key map "v" 'sc-version)
(define-key map "w" 'sc-insert-reference) (define-key map "w" 'sc-insert-reference)
(define-key map "\C-t" sc-T-keymap) (define-key map "\C-t" sc-T-keymap)
(define-key map "\C-b" 'sc-submit-bug-report)
(define-key map "?" 'sc-describe) (define-key map "?" 'sc-describe)
map) map)
"Keymap for Supercite quasi-mode.") "Keymap for Supercite quasi-mode.")
...@@ -1969,29 +1965,11 @@ cited." ...@@ -1969,29 +1965,11 @@ cited."
(insert (sc-mail-field "sc-citation")) (insert (sc-mail-field "sc-citation"))
(error "Line is already cited")))) (error "Line is already cited"))))
;; The argument logic here is crazy.
(defun sc-version (message)
"Return the current Supercite version.
If MESSAGE is non-nil (interactively, with no prefix argument),
echoes the version in the minibuffer. Otherwise, inserts the
version at point."
(interactive (list (not current-prefix-arg)))
(let ((verstr (format "Using Supercite.el %s" emacs-version)))
(if message
(message verstr)
(insert "`sc-version' says: " verstr))))
(make-obsolete 'sc-version 'emacs-version "23.1")
(defun sc-describe () (defun sc-describe ()
"Read the Supercite info node." "Read the Supercite info node."
(interactive) (interactive)
(info "(SC)top")) (info "(SC)top"))
(make-obsolete 'sc-describe "read the SC manual using `info'." "23.1")
(define-obsolete-function-alias 'sc-submit-bug-report 'report-emacs-bug "23.1")
;; useful stuff ;; useful stuff
(provide 'supercite) (provide 'supercite)
......
...@@ -748,12 +748,10 @@ Faces `compilation-error-face', `compilation-warning-face', ...@@ -748,12 +748,10 @@ Faces `compilation-error-face', `compilation-warning-face',
(defvar compilation-leave-directory-face 'font-lock-builtin-face (defvar compilation-leave-directory-face 'font-lock-builtin-face
"Face name to use for leaving directory messages.") "Face name to use for leaving directory messages.")
;; Used for compatibility with the old compile.el. ;; Used for compatibility with the old compile.el.
(defvar compilation-parse-errors-function nil) (defvar compilation-parse-errors-function nil)
(make-obsolete 'compilation-parse-errors-function (make-obsolete-variable 'compilation-parse-errors-function
'compilation-error-regexp-alist "24.1") 'compilation-error-regexp-alist "24.1")
(defcustom compilation-auto-jump-to-first-error nil (defcustom compilation-auto-jump-to-first-error nil
"If non-nil, automatically jump to the first error during compilation." "If non-nil, automatically jump to the first error during compilation."
...@@ -1499,24 +1497,6 @@ Otherwise, construct a buffer name from NAME-OF-MODE." ...@@ -1499,24 +1497,6 @@ Otherwise, construct a buffer name from NAME-OF-MODE."
(t (t
(concat "*" (downcase name-of-mode) "*")))) (concat "*" (downcase name-of-mode) "*"))))
;; This is a rough emulation of the old hack, until the transition to new
;; compile is complete.
(defun compile-internal (command error-message
&optional _name-of-mode parser
error-regexp-alist name-function
_enter-regexp-alist _leave-regexp-alist
file-regexp-alist _nomessage-regexp-alist
_no-async highlight-regexp _local-map)
(if parser
(error "Compile now works very differently, see `compilation-error-regexp-alist'"))
(let ((compilation-error-regexp-alist
(append file-regexp-alist (or error-regexp-alist
compilation-error-regexp-alist)))
(compilation-error (replace-regexp-in-string "^No more \\(.+\\)s\\.?"
"\\1" error-message)))
(compilation-start command nil name-function highlight-regexp)))
(make-obsolete 'compile-internal 'compilation-start "22.1")
(defcustom compilation-always-kill nil (defcustom compilation-always-kill nil
"If t, always kill a running compilation process before starting a new one. "If t, always kill a running compilation process before starting a new one.
If nil, ask to kill it." If nil, ask to kill it."
......
...@@ -76,18 +76,6 @@ Commands: ...@@ -76,18 +76,6 @@ Commands:
Commands must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode, Commands must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode,
but can be invoked directly in `fast' mode.") but can be invoked directly in `fast' mode.")
(define-obsolete-variable-alias 'emerge-version 'emacs-version "23.2")
(defun emerge-version ()
"Return string describing the version of Emerge.
When called interactively, displays the version."
(interactive)
(if (called-interactively-p 'interactive)
(message "Emerge version %s" emacs-version)
emacs-version))
(make-obsolete 'emerge-version 'emacs-version "23.2")
;;; Emerge configuration variables ;;; Emerge configuration variables
(defgroup emerge nil (defgroup emerge nil
......
...@@ -104,11 +104,6 @@ If 'changed, only request confirmation if the list of files has ...@@ -104,11 +104,6 @@ If 'changed, only request confirmation if the list of files has
:group 'log-edit :group 'log-edit
:type 'boolean) :type 'boolean)
(defvar cvs-commit-buffer-require-final-newline t)
(make-obsolete-variable 'cvs-commit-buffer-require-final-newline
'log-edit-require-final-newline
"21.1")
(defcustom log-edit-require-final-newline (defcustom log-edit-require-final-newline
cvs-commit-buffer-require-final-newline cvs-commit-buffer-require-final-newline
"Enforce a newline at the end of commit log messages. "Enforce a newline at the end of commit log messages.
...@@ -154,11 +149,6 @@ can be obtained from `log-edit-files'." ...@@ -154,11 +149,6 @@ can be obtained from `log-edit-files'."
:group 'log-edit :group 'log-edit
:version "24.1") :version "24.1")
(defvar cvs-changelog-full-paragraphs t)
(make-obsolete-variable 'cvs-changelog-full-paragraphs
'log-edit-changelog-full-paragraphs
"21.1")
(defvar log-edit-changelog-full-paragraphs cvs-changelog-full-paragraphs (defvar log-edit-changelog-full-paragraphs cvs-changelog-full-paragraphs
"If non-nil, include full ChangeLog paragraphs in the log. "If non-nil, include full ChangeLog paragraphs in the log.
This may be set in the ``local variables'' section of a ChangeLog, to This may be set in the ``local variables'' section of a ChangeLog, to
......
...@@ -133,14 +133,9 @@ current line. See also `cvs-invert-ignore-marks'" ...@@ -133,14 +133,9 @@ current line. See also `cvs-invert-ignore-marks'"
:group 'pcl-cvs :group 'pcl-cvs
:type '(boolean)) :type '(boolean))
(defvar cvs-diff-ignore-marks t)
(make-obsolete-variable 'cvs-diff-ignore-marks
'cvs-invert-ignore-marks
"21.1")
(defcustom cvs-invert-ignore-marks (defcustom cvs-invert-ignore-marks
(let ((l ())) (let ((l ()))
(unless (equal cvs-diff-ignore-marks cvs-default-ignore-marks) (unless (equal cvs-default-ignore-marks t)
(push "diff" l)) (push "diff" l))
(when (and cvs-force-dir-tag (not cvs-default-ignore-marks)) (when (and cvs-force-dir-tag (not cvs-default-ignore-marks))
(push "tag" l)) (push "tag" l))
...@@ -171,11 +166,6 @@ If set to nil, `cvs-mode-add' will always prompt for a message." ...@@ -171,11 +166,6 @@ If set to nil, `cvs-mode-add' will always prompt for a message."
:type '(choice (const :tag "Prompt" nil) :type '(choice (const :tag "Prompt" nil)
(string))) (string)))
(defvar cvs-diff-buffer-name "*cvs-diff*")
(make-obsolete-variable 'cvs-diff-buffer-name
'cvs-buffer-name-alist
"21.1")
(defcustom cvs-find-file-and-jump nil (defcustom cvs-find-file-and-jump nil
"Jump to the modified area when finding a file. "Jump to the modified area when finding a file.
If non-nil, `cvs-mode-find-file' will place the cursor at the beginning of If non-nil, `cvs-mode-find-file' will place the cursor at the beginning of
...@@ -185,7 +175,7 @@ have no effect." ...@@ -185,7 +175,7 @@ have no effect."
:type '(boolean)) :type '(boolean))
(defcustom cvs-buffer-name-alist (defcustom cvs-buffer-name-alist
'(("diff" cvs-diff-buffer-name diff-mode) '(("diff" "*cvs-diff*" diff-mode)
("status" "*cvs-info*" cvs-status-mode) ("status" "*cvs-info*" cvs-status-mode)
("tree" "*cvs-info*" cvs-status-mode) ("tree" "*cvs-info*" cvs-status-mode)
("message" "*cvs-commit*" nil log-edit) ("message" "*cvs-commit*" nil log-edit)
......
...@@ -34,18 +34,6 @@ ...@@ -34,18 +34,6 @@
;; Customization Variables (the rest is in vc.el) ;; Customization Variables (the rest is in vc.el)
(defvar vc-ignore-vc-files nil)
(make-obsolete-variable 'vc-ignore-vc-files
"set `vc-handled-backends' to nil to disable VC."
"21.1")
(defvar vc-master-templates ())
(make-obsolete-variable 'vc-master-templates
"to define master templates for a given BACKEND, use
vc-BACKEND-master-templates. To enable or disable VC for a given
BACKEND, use `vc-handled-backends'."
"21.1")
(defcustom vc-ignore-dir-regexp (defcustom vc-ignore-dir-regexp
;; Stop SMB, automounter, AFS, and DFS host lookups. ;; Stop SMB, automounter, AFS, and DFS host lookups.
locate-dominating-stop-dir-regexp locate-dominating-stop-dir-regexp
...@@ -586,16 +574,7 @@ If FILE is not registered, this function always returns nil." ...@@ -586,16 +574,7 @@ If FILE is not registered, this function always returns nil."
"Check if FILE is registered in BACKEND using vc-BACKEND-master-templates." "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates."
(let ((sym (vc-make-backend-sym backend 'master-templates))) (let ((sym (vc-make-backend-sym backend 'master-templates)))
(unless (get backend 'vc-templates-grabbed) (unless (get backend 'vc-templates-grabbed)
(put backend 'vc-templates-grabbed t) (put backend 'vc-templates-grabbed t))
(set sym (append (delq nil
(mapcar
(lambda (template)
(and (consp template)
(eq (cdr template) backend)
(car template)))
(with-no-warnings
vc-master-templates)))
(symbol-value sym))))
(let ((result (vc-check-master-templates file (symbol-value sym)))) (let ((result (vc-check-master-templates file (symbol-value sym))))
(if (stringp result) (if (stringp result)
(vc-file-setprop file 'vc-name result) (vc-file-setprop file 'vc-name result)
......
...@@ -808,16 +808,6 @@ is sensitive to blank lines." ...@@ -808,16 +808,6 @@ is sensitive to blank lines."
(string :tag "Comment End"))) (string :tag "Comment End")))
:group 'vc) :group 'vc)
(defcustom vc-checkout-carefully (= (user-uid) 0)
"Non-nil means be extra-careful in checkout.
Verify that the file really is not locked
and that its contents match what the repository version says."
:type 'boolean
:group 'vc)
(make-obsolete-variable 'vc-checkout-carefully
"the corresponding checks are always done now."
"21.1")
;; Variables users don't need to see ;; Variables users don't need to see
......
2012-09-24 Chong Yidong <cyd@gnu.org>
* chartab.c (Fset_char_table_default): Obsolete function removed.
2012-09-23 Paul Eggert <eggert@cs.ucla.edu> 2012-09-23 Paul Eggert <eggert@cs.ucla.edu>
Move pid_t related decls out of lisp.h. Move pid_t related decls out of lisp.h.
......
...@@ -655,15 +655,6 @@ or a character code. Return VALUE. */) ...@@ -655,15 +655,6 @@ or a character code. Return VALUE. */)
return value; return value;
} }
DEFUN ("set-char-table-default", Fset_char_table_default,
Sset_char_table_default, 3, 3, 0,
doc: /*
This function is obsolete and has no effect. */)
(Lisp_Object char_table, Lisp_Object ch, Lisp_Object value)
{
return Qnil;
}
/* Look up the element in TABLE at index CH, and return it as an /* Look up the element in TABLE at index CH, and return it as an
integer. If the element is not a character, return CH itself. */ integer. If the element is not a character, return CH itself. */
...@@ -1415,7 +1406,6 @@ syms_of_chartab (void) ...@@ -1415,7 +1406,6 @@ syms_of_chartab (void)
defsubr (&Sset_char_table_extra_slot); defsubr (&Sset_char_table_extra_slot);
defsubr (&Schar_table_range); defsubr (&Schar_table_range);
defsubr (&Sset_char_table_range); defsubr (&Sset_char_table_range);
defsubr (&Sset_char_table_default);
defsubr (&Soptimize_char_table); defsubr (&Soptimize_char_table);
defsubr (&Smap_char_table); defsubr (&Smap_char_table);
defsubr (&Sunicode_property_table_internal); defsubr (&Sunicode_property_table_internal);
......
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