aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2010-04-23 11:59:32 -0400
committerStefan Monnier2010-04-23 11:59:32 -0400
commit3b548e1b3acf989c1bb866348f6dcff3d9a25d27 (patch)
tree773ac13e5db952a5cdec604df7a06c98be7f9403
parentff5dec5cd103f6a9b030d295b014f0ff81025def (diff)
downloademacs-3b548e1b3acf989c1bb866348f6dcff3d9a25d27.tar.gz
emacs-3b548e1b3acf989c1bb866348f6dcff3d9a25d27.zip
* progmodes/compile.el: (compilation-start): Abbreviate default directory.
-rw-r--r--lisp/ChangeLog20
-rw-r--r--lisp/progmodes/compile.el3
2 files changed, 14 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c68163fa00..5b1396a9198 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,20 @@
12010-04-23 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/compile.el (compilation-start): Abbreviate default directory.
4
12010-04-23 Michael Albinus <michael.albinus@gmx.de> 52010-04-23 Michael Albinus <michael.albinus@gmx.de>
2 6
3 Implement SELINUX backends. 7 Implement SELINUX backends.
4 8
5 * net/tramp.el (tramp-file-name-handler-alist): Add 9 * net/tramp.el (tramp-file-name-handler-alist):
6 `file-selinux-context' and `set-file-selinux-context'. 10 Add `file-selinux-context' and `set-file-selinux-context'.
7 (tramp-handle-file-selinux-context) 11 (tramp-handle-file-selinux-context)
8 (tramp-handle-set-file-selinux-context): New defuns. 12 (tramp-handle-set-file-selinux-context): New defuns.
9 (tramp-handle-copy-file, tramp-do-copy-or-rename-file): Handle 13 (tramp-handle-copy-file, tramp-do-copy-or-rename-file):
10 PRESERVE-SELINUX-CONTEXT. 14 Handle PRESERVE-SELINUX-CONTEXT.
11 15
12 * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Add 16 * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
13 `file-selinux-context' and `set-file-selinux-context'. 17 Add `file-selinux-context' and `set-file-selinux-context'.
14 (tramp-gvfs-handle-file-selinux-context) 18 (tramp-gvfs-handle-file-selinux-context)
15 (tramp-gvfs-handle-set-file-selinux-context): New defuns. 19 (tramp-gvfs-handle-set-file-selinux-context): New defuns.
16 (tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT. 20 (tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT.
@@ -18,8 +22,8 @@
18 * net/ange-ftp.el (ange-ftp-copy-file): 22 * net/ange-ftp.el (ange-ftp-copy-file):
19 * net/tramp-fish.el (tramp-fish-handle-copy-file): 23 * net/tramp-fish.el (tramp-fish-handle-copy-file):
20 * net/tramp-imap.el (tramp-imap-handle-copy-file): 24 * net/tramp-imap.el (tramp-imap-handle-copy-file):
21 * net/tramp-smb.el (tramp-smb-handle-copy-file): Add 25 * net/tramp-smb.el (tramp-smb-handle-copy-file):
22 PRESERVE-SELINUX-CONTEXT. 26 Add PRESERVE-SELINUX-CONTEXT.
23 27
242010-04-22 Michael Albinus <michael.albinus@gmx.de> 282010-04-22 Michael Albinus <michael.albinus@gmx.de>
25 29
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 13cf862ee18..f5fd9fd6608 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1265,7 +1265,8 @@ Returns the compilation buffer created."
1265 (set (make-local-variable 'compilation-auto-jump-to-next) t)) 1265 (set (make-local-variable 'compilation-auto-jump-to-next) t))
1266 ;; Output a mode setter, for saving and later reloading this buffer. 1266 ;; Output a mode setter, for saving and later reloading this buffer.
1267 (insert "-*- mode: " name-of-mode 1267 (insert "-*- mode: " name-of-mode
1268 "; default-directory: " (prin1-to-string default-directory) 1268 "; default-directory: "
1269 (prin1-to-string (abbreviate-file-name default-directory))
1269 " -*-\n" 1270 " -*-\n"
1270 (format "%s started at %s\n\n" 1271 (format "%s started at %s\n\n"
1271 mode-name 1272 mode-name