Merge from origin/emacs-24

Browse source

The following commit was skipped:

9869d6f Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with master.

...

This commit is contained in:

Paul Eggert 2015-03-08 18:48:47 -07:00

parent 8e07ea1a05 9869d6f612

commit 0dfe7002a6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available