Mercurial > emacs
comparison lisp/ediff-init.el @ 64007:35df749b5a09
(ediff-highlighting, ediff-merge, ediff-hook): Finish `defgroup' description
with period.
(ediff-abbrev-jobname): "?\ " -> "?\s".
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 04 Jul 2005 02:00:10 +0000 |
parents | 02c83ab8178d |
children | 6fb026ad601f |
comparison
equal
deleted
inserted
replaced
64006:d9c0fd880028 | 64007:35df749b5a09 |
---|---|
391 (or (ediff-in-control-buffer-p meta-buf-p) | 391 (or (ediff-in-control-buffer-p meta-buf-p) |
392 (error "%S: This command runs in Ediff Control Buffer only!" | 392 (error "%S: This command runs in Ediff Control Buffer only!" |
393 this-command))) | 393 this-command))) |
394 | 394 |
395 (defgroup ediff-highlighting nil | 395 (defgroup ediff-highlighting nil |
396 "Hilighting of difference regions in Ediff" | 396 "Hilighting of difference regions in Ediff." |
397 :prefix "ediff-" | 397 :prefix "ediff-" |
398 :group 'ediff) | 398 :group 'ediff) |
399 | 399 |
400 (defgroup ediff-merge nil | 400 (defgroup ediff-merge nil |
401 "Merging utilities" | 401 "Merging utilities." |
402 :prefix "ediff-" | 402 :prefix "ediff-" |
403 :group 'ediff) | 403 :group 'ediff) |
404 | 404 |
405 (defgroup ediff-hook nil | 405 (defgroup ediff-hook nil |
406 "Hooks run by Ediff" | 406 "Hooks run by Ediff." |
407 :prefix "ediff-" | 407 :prefix "ediff-" |
408 :group 'ediff) | 408 :group 'ediff) |
409 | 409 |
410 ;; Hook variables | 410 ;; Hook variables |
411 | 411 |
1838 "Merge dir files with versions") | 1838 "Merge dir files with versions") |
1839 ((eq jobname 'ediff-merge-directory-revisions-with-ancestor) | 1839 ((eq jobname 'ediff-merge-directory-revisions-with-ancestor) |
1840 "Merge dir versions via ancestors") | 1840 "Merge dir versions via ancestors") |
1841 (t | 1841 (t |
1842 (capitalize | 1842 (capitalize |
1843 (subst-char-in-string ?- ?\ (substring (symbol-name jobname) 6)))) | 1843 (subst-char-in-string ?- ?\s (substring (symbol-name jobname) 6)))) |
1844 )) | 1844 )) |
1845 | 1845 |
1846 | 1846 |
1847 ;; If ediff modified mode line, strip the modification | 1847 ;; If ediff modified mode line, strip the modification |
1848 (defsubst ediff-strip-mode-line-format () | 1848 (defsubst ediff-strip-mode-line-format () |