summaryrefslogtreecommitdiff
path: root/lisp/descr-text.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
commita3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree863d5db087c8e034c96d06ea955515f4d3f3d0a3 /lisp/descr-text.el
parent7f818df9420a1320539f7e3e633003573a570413 (diff)
parent721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
downloademacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip
Merge from mainline.
Diffstat (limited to 'lisp/descr-text.el')
-rw-r--r--lisp/descr-text.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 65761e752ba..65590a737fc 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -769,5 +769,4 @@ as well as widgets, buttons, overlays, and text properties."
(provide 'descr-text)
-;; arch-tag: fc55a498-f3e9-4312-b5bd-98cc02480af1
;;; descr-text.el ends here