Mercurial > emacs

diff lisp/vc/smerge-mode.el @ 111223:0cd3fc7f7dba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove duplicate Lisp definition of temporary-file-directory, from filelock.c. * lisp/files.el (temporary-file-directory): Remove (already defined in C). * lisp/cus-start.el: Add temporary-file-directory.
author Glenn Morris <rgm@gnu.org>
date Thu, 28 Oct 2010 23:51:36 -0700
parents d928a6a7c3f2
children c77749185234 68616bb3ae25 80d61d4081a0
line wrap: on
line diff