Mercurial > emacs

comparison lisp/smerge-mode.el @ 70255:d57fb8c98714

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* net/tramp.el (tramp-completion-file-name-handler): Disable Tramp's functionality while loading Tramp itself. (tramp-register-file-name-handlers): That's a defsubst now. Code from `tramp-repair-jka-compr' moved here. Apply it via `after-init-hook'. (tramp-repair-jka-compr): Removed.
author Michael Albinus <michael.albinus@gmx.de>
date Fri, 28 Apr 2006 04:06:16 +0000
parents 3bd95f4f2941
children 2b77fa42947f b98066f4aa10 c5406394f567
comparison
equal deleted inserted replaced
70254:3732dd943c16 70255:d57fb8c98714