aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-07-31 21:35:59 +0000
committerJuanma Barranquero2008-07-31 21:35:59 +0000
commit094eabe4073fbcae7a39649e2c0f4f08c85a0dbd (patch)
treeecf0b6a42fb8826196476aaefea512f6169b4a15
parent20431da988769483b468d084252762dc27f323c1 (diff)
downloademacs-094eabe4073fbcae7a39649e2c0f4f08c85a0dbd.tar.gz
emacs-094eabe4073fbcae7a39649e2c0f4f08c85a0dbd.zip
* files.el (read-file-modes): Fix tpo in docstring.
-rw-r--r--lisp/ChangeLog15
-rw-r--r--lisp/files.el12
2 files changed, 15 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad373c81fbb..2a4805f620f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
12008-07-31 Juanma Barranquero <lekktu@gmail.com>
2
3 * files.el (read-file-modes): Fix tpo in docstring.
4
12008-07-31 Chong Yidong <cyd@stupidchicken.com> 52008-07-31 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * minibuffer.el (read-file-name-completion-ignore-case): Add 7 * minibuffer.el (read-file-name-completion-ignore-case):
4 cygwin to the list. 8 Add cygwin to the list.
5 9
62008-07-31 Sven Joachim <svenjoac@gmx.de> 102008-07-31 Sven Joachim <svenjoac@gmx.de>
7 11
@@ -18,7 +22,7 @@
18 (dbus-return-values-table): New defvar. 22 (dbus-return-values-table): New defvar.
19 (dbus-call-method-non-blocking-handler, dbus-event-message-type): 23 (dbus-call-method-non-blocking-handler, dbus-event-message-type):
20 New defun. 24 New defun.
21 (dbus-check-event, dbus-handle-event, dbus-event-serial-number, ): 25 (dbus-check-event, dbus-handle-event, dbus-event-serial-number):
22 Extend docstring. Adapt implementation according to new 26 Extend docstring. Adapt implementation according to new
23 `dbus-event' layout. 27 `dbus-event' layout.
24 (dbus-event-service-name, dbus-event-path-name) 28 (dbus-event-service-name, dbus-event-path-name)
@@ -26,8 +30,7 @@
26 implementation according to new `dbus-event' layout. 30 implementation according to new `dbus-event' layout.
27 (dbus-set-property): Correct `dbus-introspect-get-attribute' call. 31 (dbus-set-property): Correct `dbus-introspect-get-attribute' call.
28 32
29 * net/xesam.el (xesam-type, xesam-query, xesam-xml-string): New 33 * net/xesam.el (xesam-type, xesam-query, xesam-xml-string): New defvar.
30 defvar.
31 (xesam-mode): Rework implementation. 34 (xesam-mode): Rework implementation.
32 (xesam-new-search): Additional parameter TYPE. 35 (xesam-new-search): Additional parameter TYPE.
33 (xesam-search): Adapt call of `xesam-new-search'. 36 (xesam-search): Adapt call of `xesam-new-search'.
@@ -231,7 +234,7 @@
231 234
2322008-07-30 Wilson Snyder <wsnyder@wsnyder.org> 2352008-07-30 Wilson Snyder <wsnyder@wsnyder.org>
233 236
234 * verilog-mode (verilog-read-decls): Allow AUTORESET to work with 237 * verilog-mode (verilog-read-decls): Allow AUTORESET to work with
235 SV 'logic' signals. [Julian Gorfajn] 238 SV 'logic' signals. [Julian Gorfajn]
236 (verilog-auto-inst-column): Make verilog-auto-inst-column customizable. 239 (verilog-auto-inst-column): Make verilog-auto-inst-column customizable.
237 (verilog-string-replace-matches): Avoid recursion with small 240 (verilog-string-replace-matches): Avoid recursion with small
diff --git a/lisp/files.el b/lisp/files.el
index dc42356f303..ee9f6bb43bc 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -102,15 +102,15 @@ But it is local only if you make it local.")
102(defcustom backup-by-copying nil 102(defcustom backup-by-copying nil
103 "Non-nil means always use copying to create backup files. 103 "Non-nil means always use copying to create backup files.
104See documentation of variable `make-backup-files'." 104See documentation of variable `make-backup-files'."
105 :type 'boolean 105 :type 'boolean
106 :group 'backup) 106 :group 'backup)
107 107
108(defcustom backup-by-copying-when-linked nil 108(defcustom backup-by-copying-when-linked nil
109 "Non-nil means use copying to create backups for files with multiple names. 109 "Non-nil means use copying to create backups for files with multiple names.
110This causes the alternate names to refer to the latest version as edited. 110This causes the alternate names to refer to the latest version as edited.
111This variable is relevant only if `backup-by-copying' is nil." 111This variable is relevant only if `backup-by-copying' is nil."
112 :type 'boolean 112 :type 'boolean
113 :group 'backup) 113 :group 'backup)
114 114
115(defcustom backup-by-copying-when-mismatch nil 115(defcustom backup-by-copying-when-mismatch nil
116 "Non-nil means create backups by copying if this preserves owner or group. 116 "Non-nil means create backups by copying if this preserves owner or group.
@@ -2519,7 +2519,7 @@ in order to initialize other data structure based on them.")
2519Each element is a cons cell (VAR . VAL), where VAR is a variable 2519Each element is a cons cell (VAR . VAL), where VAR is a variable
2520symbol and VAL is a value that is considered safe." 2520symbol and VAL is a value that is considered safe."
2521 :group 'find-file 2521 :group 'find-file
2522 :type 'alist) 2522 :type 'alist)
2523 2523
2524(defcustom safe-local-eval-forms '((add-hook 'write-file-hooks 'time-stamp)) 2524(defcustom safe-local-eval-forms '((add-hook 'write-file-hooks 'time-stamp))
2525 "Expressions that are considered safe in an `eval:' local variable. 2525 "Expressions that are considered safe in an `eval:' local variable.
@@ -5766,7 +5766,7 @@ FROM (or 0 if nil) is the orginal modes of the file to be chmod'ed."
5766(defun read-file-modes (&optional prompt orig-file) 5766(defun read-file-modes (&optional prompt orig-file)
5767 "Read file modes in octal or symbolic notation. 5767 "Read file modes in octal or symbolic notation.
5768PROMPT is used as the prompt, default to `File modes (octal or symbolic): '. 5768PROMPT is used as the prompt, default to `File modes (octal or symbolic): '.
5769ORIG-FILE is the original file of which modes will be change." 5769ORIG-FILE is the original file of which modes will be changed."
5770 (let* ((modes (or (if orig-file (file-modes orig-file) 0) 5770 (let* ((modes (or (if orig-file (file-modes orig-file) 0)
5771 (error "File not found"))) 5771 (error "File not found")))
5772 (modestr (and (stringp orig-file) 5772 (modestr (and (stringp orig-file)