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/generic-x.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/generic-x.el')
-rw-r--r-- | lisp/generic-x.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/generic-x.el b/lisp/generic-x.el index ee7a75491bb..9c503afc308 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1992,5 +1992,4 @@ like an INI file. You can add this hook to `find-file-hook'." (provide 'generic-x) -;; arch-tag: cde692a5-9ff6-4506-9999-c67999c2bdb5 ;;; generic-x.el ends here |