[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100574: Minor portability fix in
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100574: Minor portability fix in smerge-mode.el. |
Date: |
Mon, 09 May 2011 18:21:54 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 100574
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-05-09 18:21:54 +0300
message:
Minor portability fix in smerge-mode.el.
lisp/smerge-mode.el (smerge-resolve): Use null-device rather than a
literal "/dev/null".
modified:
lisp/ChangeLog
lisp/smerge-mode.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-09 15:17:05 +0000
+++ b/lisp/ChangeLog 2011-05-09 15:21:54 +0000
@@ -1,3 +1,8 @@
+2011-05-09 Eli Zaretskii <address@hidden>
+
+ * smerge-mode.el (smerge-resolve): Use null-device rather than a
+ literal "/dev/null".
+
2011-05-09 Stefan Monnier <address@hidden>
* emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):
=== modified file 'lisp/smerge-mode.el'
--- a/lisp/smerge-mode.el 2011-01-02 23:50:46 +0000
+++ b/lisp/smerge-mode.el 2011-05-09 15:21:54 +0000
@@ -535,7 +535,7 @@
(with-current-buffer buf
(zerop (call-process-region
(point-min) (point-max) "patch" t nil nil
- "-r" "/dev/null" "--no-backup-if-mismatch"
+ "-r" null-device "--no-backup-if-mismatch"
"-fl" o))))
(save-restriction
(narrow-to-region m0b m0e)
@@ -551,7 +551,7 @@
(with-current-buffer buf
(zerop (call-process-region
(point-min) (point-max) "patch" t nil nil
- "-r" "/dev/null" "--no-backup-if-mismatch"
+ "-r" null-device "--no-backup-if-mismatch"
"-fl" m))))
(save-restriction
(narrow-to-region m0b m0e)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100574: Minor portability fix in smerge-mode.el.,
Eli Zaretskii <=