From d97034985aea86dbc2405db1cab5433c65339ac4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 23 Sep 2010 00:09:24 -0700 Subject: [PATCH] Tiny comint.el change. * lisp/comint.el (comint-use-prompt-regexp-instead-of-fields): Move alias before definition, so it does not need autoloading. --- lisp/ChangeLog | 3 +++ lisp/comint.el | 14 ++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1316cc95193..7bf7ed53108 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-09-23 Glenn Morris + * comint.el (comint-use-prompt-regexp-instead-of-fields): + Move alias before definition, so it does not need autoloading. + * emulation/crisp.el, emulation/cua-base.el, emulation/edt.el: * emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el: * international/kkc.el, international/ogonek.el, mail/feedmail.el: diff --git a/lisp/comint.el b/lisp/comint.el index 641be4f4d22..282e9eef49c 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1,8 +1,8 @@ ;;; comint.el --- general command interpreter in a window stuff -;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Olin Shivers ;; Simon Marshall @@ -415,6 +415,9 @@ See `comint-send-input'." :type 'boolean :group 'comint) +(define-obsolete-variable-alias 'comint-use-prompt-regexp-instead-of-fields + 'comint-use-prompt-regexp "22.1") + ;; Note: If it is decided to purge comint-prompt-regexp from the source ;; entirely, searching for uses of this variable will help to identify ;; places that need attention. @@ -427,11 +430,6 @@ respect field boundaries in a natural way)." :type 'boolean :group 'comint) -;; Autoload is necessary for Custom to recognize old alias. -;;;###autoload -(define-obsolete-variable-alias 'comint-use-prompt-regexp-instead-of-fields - 'comint-use-prompt-regexp "22.1") - (defcustom comint-mode-hook nil "Hook run upon entry to `comint-mode'. This is run before the process is cranked up." -- 2.11.4.GIT