From bed7f14004246c8ade77a48f79f0cc48f2ca74f7 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 20 Apr 2011 14:18:34 -0300 Subject: [PATCH] * lisp/obsolete/erc-hecomplete.el: Make obsolete. * obsolete/: Standardize obsolescence info in the header. --- lisp/ChangeLog | 5 +++++ lisp/obsolete/awk-mode.el | 3 +-- lisp/{erc => obsolete}/erc-hecomplete.el | 17 ++++++++--------- lisp/obsolete/fast-lock.el | 3 +-- lisp/obsolete/iso-acc.el | 3 +-- lisp/obsolete/iso-insert.el | 3 +-- lisp/obsolete/iso-swed.el | 3 +-- lisp/obsolete/keyswap.el | 3 +-- lisp/obsolete/lazy-lock.el | 3 +-- lisp/obsolete/old-whitespace.el | 3 +-- lisp/obsolete/options.el | 3 +-- lisp/obsolete/resume.el | 3 +-- lisp/obsolete/scribe.el | 3 +-- lisp/obsolete/swedish.el | 3 +-- lisp/obsolete/vc-mcvs.el | 4 +--- 15 files changed, 26 insertions(+), 36 deletions(-) rename lisp/{erc => obsolete}/erc-hecomplete.el (95%) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 867d7f9aa23..a7aedca6944 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-04-20 Stefan Monnier + + * obsolete/erc-hecomplete.el: Make obsolete. + * obsolete/: Standardize obsolescence info in the header. + 2011-04-20 Glenn Morris * calendar/solar.el (solar-horizontal-coordinates): diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el index d09ff1dd892..1a6d08c08ef 100644 --- a/lisp/obsolete/awk-mode.el +++ b/lisp/obsolete/awk-mode.el @@ -4,6 +4,7 @@ ;; Maintainer: FSF ;; Keywords: unix, languages +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -22,8 +23,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; Sets up C-mode with support for awk-style #-comments and a lightly ;; hacked syntax table. diff --git a/lisp/erc/erc-hecomplete.el b/lisp/obsolete/erc-hecomplete.el similarity index 95% rename from lisp/erc/erc-hecomplete.el rename to lisp/obsolete/erc-hecomplete.el index 530c586d24f..67f51d690b2 100644 --- a/lisp/erc/erc-hecomplete.el +++ b/lisp/obsolete/erc-hecomplete.el @@ -4,6 +4,7 @@ ;; Author: Alex Schroeder ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion +;; Obsolete-since: 24.1 ;; This file is part of GNU Emacs. @@ -108,16 +109,14 @@ add this string when a unique expansion was found." This is a function to put on `hippie-expand-try-functions-list'. Then use \\[hippie-expand] to expand nicks. The type of completion depends on `erc-nick-completion'." - (cond ((eq erc-nick-completion 'pals) - (try-complete-erc-nick old erc-pals)) - ((eq erc-nick-completion 'all) - (try-complete-erc-nick old (append + (try-complete-erc-nick old (cond ((eq erc-nick-completion 'pals) erc-pals) + ((eq erc-nick-completion 'all) + (append (erc-get-channel-nickname-list) - (erc-command-list)))) - ((functionp erc-nick-completion) - (try-complete-erc-nick old (funcall erc-nick-completion))) - (t - (try-complete-erc-nick old erc-nick-completion)))) + (erc-command-list))) + ((functionp erc-nick-completion) + (funcall erc-nick-completion)) + (t erc-nick-completion)))) (defvar try-complete-erc-nick-window-configuration nil "The window configuration for `try-complete-erc-nick'. diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index a59e7871458..9c750ca5e89 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: faces files ;; Version: 3.14 +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -24,8 +25,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; Fast Lock mode is a Font Lock support mode. ;; It makes visiting a file in Font Lock mode faster by restoring its face text ;; properties from automatically saved associated Font Lock cache files. diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el index 14b6a202012..cb06091dfcf 100644 --- a/lisp/obsolete/iso-acc.el +++ b/lisp/obsolete/iso-acc.el @@ -5,6 +5,7 @@ ;; Author: Johan Vromans ;; Maintainer: FSF ;; Keywords: i18n +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -23,8 +24,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; Function `iso-accents-mode' activates a minor mode in which ;; typewriter "dead keys" are emulated. The purpose of this emulation ;; is to provide a simple means for inserting accented characters diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el index 3f3b6d4abb3..c223d096730 100644 --- a/lisp/obsolete/iso-insert.el +++ b/lisp/obsolete/iso-insert.el @@ -5,6 +5,7 @@ ;; Author: Howard Gayle ;; Maintainer: FSF ;; Keywords: i18n +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -23,8 +24,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; Provides keys for inserting ISO Latin-1 characters. They use the ;; prefix key C-x 8. Type C-x 8 C-h for a list. diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el index d197f0d5b67..43686283e89 100644 --- a/lisp/obsolete/iso-swed.el +++ b/lisp/obsolete/iso-swed.el @@ -5,6 +5,7 @@ ;; Author: Howard Gayle ;; Maintainer: FSF ;; Keywords: i18n +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -23,8 +24,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; Written by Howard Gayle. See case-table.el for details. ;;; Code: diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el index f95b8f5bdb5..ec1263e5189 100644 --- a/lisp/obsolete/keyswap.el +++ b/lisp/obsolete/keyswap.el @@ -4,6 +4,7 @@ ;; Author: Eric S. Raymond ;; Keywords: terminals +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -22,8 +23,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; This package is meant to be called by other terminal packages. ;;; Code: diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el index f922a5c30b6..a04db4a0c72 100644 --- a/lisp/obsolete/lazy-lock.el +++ b/lisp/obsolete/lazy-lock.el @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: faces files ;; Version: 2.11 +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -24,8 +25,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; Purpose: ;; ;; Lazy Lock mode is a Font Lock support mode. diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el index be967938bc9..c33794f668d 100644 --- a/lisp/obsolete/old-whitespace.el +++ b/lisp/obsolete/old-whitespace.el @@ -4,6 +4,7 @@ ;; Author: Rajesh Vaidheeswarran ;; Keywords: convenience +;; Obsolete-since: 23.1 ;; This file is part of GNU Emacs. @@ -22,8 +23,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 23.1. - ;; URL: http://www.dsmit.com/lisp/ ;; ;; The whitespace library is intended to find and help fix five different types diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el index 1b475e9e98b..7c1c3552e2d 100644 --- a/lisp/obsolete/options.el +++ b/lisp/obsolete/options.el @@ -3,6 +3,7 @@ ;; Copyright (C) 1985, 2001-2011 Free Software Foundation, Inc. ;; Maintainer: FSF +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -21,8 +22,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; This code provides functions to list and edit the values of all global ;; option variables known to loaded Emacs Lisp code. There are two entry ;; points, `list-options' and `edit' options'. The latter enters a major diff --git a/lisp/obsolete/resume.el b/lisp/obsolete/resume.el index 6b52ef28784..c9df1184d90 100644 --- a/lisp/obsolete/resume.el +++ b/lisp/obsolete/resume.el @@ -5,6 +5,7 @@ ;; Author: Joe Wells ;; Adapted-By: ESR ;; Keywords: processes +;; Obsolete-since: 23.1 ;; This file is part of GNU Emacs. @@ -23,8 +24,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 23.1. - ;; The purpose of this library is to handle command line arguments ;; when you resume an existing Emacs job. diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el index 3f543b38e44..1fbc9bc4158 100644 --- a/lisp/obsolete/scribe.el +++ b/lisp/obsolete/scribe.el @@ -6,6 +6,7 @@ ;; (according to ack.texi) ;; Maintainer: FSF ;; Keywords: wp +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -24,8 +25,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; A major mode for editing source in written for the Scribe text formatter. ;; Knows about Scribe syntax and standard layout rules. The command to ;; run Scribe on a buffer is bogus; someone interested should fix it. diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el index 4b82a74bce7..c31af8697ef 100644 --- a/lisp/obsolete/swedish.el +++ b/lisp/obsolete/swedish.el @@ -5,6 +5,7 @@ ;; Author: Howard Gayle ;; Maintainer: FSF ;; Keywords: i18n +;; Obsolete-since: 22.1 ;; This file is part of GNU Emacs. @@ -23,8 +24,6 @@ ;;; Commentary: -;; This file has been obsolete since Emacs 22.1. - ;; Fixme: Is this actually used? if so, it should be in language, ;; possibly as a feature property of Swedish, probably defining a ;; `swascii' coding system. diff --git a/lisp/obsolete/vc-mcvs.el b/lisp/obsolete/vc-mcvs.el index 06ce7f41c65..980cdbfd71b 100644 --- a/lisp/obsolete/vc-mcvs.el +++ b/lisp/obsolete/vc-mcvs.el @@ -4,6 +4,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: None +;; Obsolete-since: 23.1 ;; This file is part of GNU Emacs. @@ -30,9 +31,6 @@ ;; ;; ********** READ THIS! ********** -;; This file has been obsolete and unsupported since Emacs 23.1. - - ;; The home page of the Meta-CVS version control system is at ;; ;; http://users.footprints.net/~kaz/mcvs.html -- 2.39.2