From efbc652a8f2fece5ddb2b971444155d9bfd20cad Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 29 Aug 2009 02:07:42 +0000 Subject: [PATCH] * progmodes/cc-vars.el (c-comment-continuation-stars): * progmodes/cc-engine.el (c-looking-at-bos): * progmodes/cc-cmds.el (c-toggle-auto-state) (c-forward-into-nomenclature, c-backward-into-nomenclature) (c-comment-line-break-function): Add version of obsolescence. --- lisp/ChangeLog | 8 ++++++++ lisp/progmodes/cc-cmds.el | 8 ++++---- lisp/progmodes/cc-engine.el | 2 +- lisp/progmodes/cc-vars.el | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0784ea8cc2b..50869b07c95 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2009-08-29 Stefan Monnier + + * progmodes/cc-vars.el (c-comment-continuation-stars): + * progmodes/cc-engine.el (c-looking-at-bos): + * progmodes/cc-cmds.el (c-toggle-auto-state) + (c-forward-into-nomenclature, c-backward-into-nomenclature) + (c-comment-line-break-function): Add version of obsolescence. + 2009-08-28 Juri Linkov * files.el (magic-fallback-mode-alist): Add ZIP magic number diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index cb88f344cc0..a34c3cfc84e 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -322,7 +322,7 @@ after special characters such as brace, comma, semi-colon, and colon." (c-keep-region-active)) (defalias 'c-toggle-auto-state 'c-toggle-auto-newline) -(make-obsolete 'c-toggle-auto-state 'c-toggle-auto-newline) +(make-obsolete 'c-toggle-auto-state 'c-toggle-auto-newline "22.1") (defun c-toggle-hungry-state (&optional arg) "Toggle hungry-delete-key feature. @@ -1330,14 +1330,14 @@ keyword on the line, the keyword is not inserted inside a literal, and (interactive "p") (require 'cc-subword) (c-forward-subword arg)) -(make-obsolete 'c-forward-into-nomenclature 'c-forward-subword) +(make-obsolete 'c-forward-into-nomenclature 'c-forward-subword "22.1") (defun c-backward-into-nomenclature (&optional arg) "Compatibility alias for `c-backward-subword'." (interactive "p") (require 'cc-subword) (c-backward-subword arg)) -(make-obsolete 'c-backward-into-nomenclature 'c-backward-subword) +(make-obsolete 'c-backward-into-nomenclature 'c-backward-subword "22.1") (defun c-scope-operator () "Insert a double colon scope operator at point. @@ -4431,7 +4431,7 @@ If a fill prefix is specified, it overrides all the above." (indent-to col)))))) (defalias 'c-comment-line-break-function 'c-indent-new-comment-line) -(make-obsolete 'c-comment-line-break-function 'c-indent-new-comment-line) +(make-obsolete 'c-comment-line-break-function 'c-indent-new-comment-line "21.1") ;; advice for indent-new-comment-line for older Emacsen (unless (boundp 'comment-line-break-function) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index b2a36220a7f..24b5a9b33f1 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -7103,7 +7103,7 @@ comment at the start of cc-engine.el for more info." ;; ;; This function might do hidden buffer changes. (c-at-statement-start-p)) -(make-obsolete 'c-looking-at-bos 'c-at-statement-start-p) +(make-obsolete 'c-looking-at-bos 'c-at-statement-start-p "22.1") (defun c-looking-at-inexpr-block (lim containing-sexp &optional check-at-end) ;; Return non-nil if we're looking at the beginning of a block diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index a1f7d3ad3f2..153b7356686 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -451,7 +451,7 @@ comment-only lines." :group 'c) (make-obsolete-variable 'c-comment-continuation-stars - 'c-block-comment-prefix) + 'c-block-comment-prefix "21.1") ;; Although c-comment-continuation-stars is obsolete, we look at it in ;; some places in CC Mode anyway, so make the compiler ignore it -- 2.39.2