Files
emacs/lisp
Glenn Morris bdfee01a65 Change Smerge "Mine" and "Other" for "Upper" and "Lower. (Bug#20878)
* lisp/vc/smerge-mode.el (smerge-diff-switches)
(smerge-context-menu, smerge-match-conflict, smerge-swap): Doc fixes.
(smerge-upper, smerge-upper-face, smerge-keep-upper)
(smerge-diff-base-upper): Rename from smerge-mine, smerge-mine-face,
smerge-keep-mine, smerge-diff-base-mine.  Update all uses.
(smerge-mine-face, smerge-other-face): Remove obsolete face aliases.
(smerge-lower, smerge-lower-face, smerge-lower-re, smerge-keep-lower)
(smerge-diff-base-lower): Rename from smerge-other, smerge-other-face,
smerge-other-re, smerge-keep-other, smerge-diff-base-lower.
Update all uses.
(smerge-basic-map): Add "l" and "u" bindings.
(smerge-mode-menu): Update menu bindings for renaming.
(smerge-font-lock-keywords): Update face names.
(smerge-match-names): Update names.
(smerge-diff-upper-lower): Rename from smerge-diff-mine-other.
(smerge-match-conflict, smerge-ediff): Rename local variables.
(smerge-makeup-conflict): Relabel markers.
(smerge-parsep-re): Use renamed variables.
2016-01-30 19:01:57 -08:00
..
2016-01-01 01:34:24 -08:00
-
2016-01-30 11:27:34 -08:00
-
2016-01-30 13:56:23 -08:00
2016-01-01 01:34:24 -08:00
-
2016-01-18 22:56:33 -08:00
2016-01-12 20:06:49 -05:00
-
2016-01-30 11:43:26 -08:00
2016-01-01 01:34:24 -08:00
-
2016-01-30 11:43:26 -08:00
-
2016-01-30 11:43:26 -08:00
-
2016-01-30 13:56:23 -08:00
2016-01-01 01:34:24 -08:00
-
2016-01-30 11:43:26 -08:00
-
2016-01-30 13:56:23 -08:00
2016-01-12 20:06:49 -05:00
-
2016-01-30 13:56:23 -08:00
-
2016-01-18 22:56:33 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-09 16:15:01 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-12 20:49:34 -05:00
2016-01-01 01:34:24 -08:00
2016-01-30 11:28:37 -08:00
2016-01-18 22:56:34 -08:00
2016-01-24 07:23:33 -05:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-12 20:06:49 -05:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-12 20:06:49 -05:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:51:27 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
-
2016-01-30 11:43:26 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
-
2016-01-30 11:27:34 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-19 19:09:45 -05:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
-
2016-01-30 11:43:26 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-11 22:48:07 -08:00
2016-01-11 22:48:07 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-12 20:06:49 -05:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-25 18:24:09 -05:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-29 11:14:13 +01:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00

This directory contains source code for the parts of Emacs that are
written in Emacs Lisp.  *.el files are Emacs Lisp source, and the
corresponding *.elc files are byte-compiled versions.  Byte-compiled
files are architecture-independent.

The term subdirectory contains Lisp files that customize Emacs for
certain terminal types.  When Emacs starts, it checks the TERM
environment variable to get the terminal type and loads
'term/${TERM}.el' if it exists.

The other subdirectories hold Lisp packages grouped by their general
purpose.