diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /lisp/loadhist.el | |
parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip |
Merge from mainline.
Diffstat (limited to 'lisp/loadhist.el')
-rw-r--r-- | lisp/loadhist.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 17f4035bf2a..763d8c38ebd 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -267,5 +267,4 @@ something strange, such as redefining an Emacs function." (provide 'loadhist) -;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798 ;;; loadhist.el ends here |