summaryrefslogtreecommitdiff
path: root/lisp/simple.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-04-15 15:28:01 +0800
committerChong Yidong <cyd@gnu.org>2012-04-15 15:28:01 +0800
commite6fd457e010c2ec034a331335530d817852cc11c (patch)
tree4c290ef2537450fca8200b57dc11dc5443c40b1c /lisp/simple.el
parent75f1671a5240bf2833fc473900b662135509ed72 (diff)
parent467a33d09f0e6d445fb020013ac65b12adffc35e (diff)
downloademacs-e6fd457e010c2ec034a331335530d817852cc11c.tar.gz
emacs-e6fd457e010c2ec034a331335530d817852cc11c.tar.bz2
emacs-e6fd457e010c2ec034a331335530d817852cc11c.zip
Merge from emacs-24 branch
Diffstat (limited to 'lisp/simple.el')
-rw-r--r--lisp/simple.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index b8422f9923a..09fe1807d8f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,6 +1,6 @@
;;; simple.el --- basic editing commands for Emacs
-;; Copyright (C) 1985-1987, 1993-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1993-2012 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
@@ -2677,13 +2677,13 @@ value passed."
(defvar process-file-side-effects t
"Whether a call of `process-file' changes remote files.
-Per default, this variable is always set to `t', meaning that a
+By default, this variable is always set to `t', meaning that a
call of `process-file' could potentially change any file on a
remote host. When set to `nil', a file handler could optimize
-its behavior with respect to remote file attributes caching.
+its behavior with respect to remote file attribute caching.
-This variable should never be changed by `setq'. Instead of, it
-shall be set only by let-binding.")
+You should only ever change this variable with a let-binding;
+never with `setq'.")
(defun start-file-process (name buffer program &rest program-args)
"Start a program in a subprocess. Return the process object for it.