HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix link errors in the Mac OS build that were caused by variables being marked as...
[bpt/emacs.git]
/
lisp
/
loadhist.el
diff --git
a/lisp/loadhist.el
b/lisp/loadhist.el
index
71e81ae
..
3395c41
100644
(file)
--- a/
lisp/loadhist.el
+++ b/
lisp/loadhist.el
@@
-1,7
+1,6
@@
;;; loadhist.el --- lisp functions for working with feature groups
;;; loadhist.el --- lisp functions for working with feature groups
-;; Copyright (C) 1995, 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000-2011 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: FSF
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: FSF
@@
-9,10
+8,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-119,7
+116,8
@@
from a file."
(defvar unload-feature-special-hooks
'(after-change-functions after-insert-file-functions
after-make-frame-functions auto-fill-function before-change-functions
(defvar unload-feature-special-hooks
'(after-change-functions after-insert-file-functions
after-make-frame-functions auto-fill-function before-change-functions
- blink-paren-function buffer-access-fontify-functions command-line-functions
+ blink-paren-function buffer-access-fontify-functions
+ choose-completion-string-functions command-line-functions
comment-indent-function compilation-finish-functions delete-frame-functions
disabled-command-function find-file-not-found-functions
font-lock-beginning-of-syntax-function font-lock-fontify-buffer-function
comment-indent-function compilation-finish-functions delete-frame-functions
disabled-command-function find-file-not-found-functions
font-lock-beginning-of-syntax-function font-lock-fontify-buffer-function
@@
-268,5
+266,4
@@
something strange, such as redefining an Emacs function."
(provide 'loadhist)
(provide 'loadhist)
-;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798
;;; loadhist.el ends here
;;; loadhist.el ends here