Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8a26c165
Commit
8a26c165
authored
Sep 18, 2005
by
Deepak Goel
Browse files
Message format spec fixes (1)
parent
be9bb408
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
185 additions
and
28 deletions
+185
-28
lisp/ChangeLog
lisp/ChangeLog
+157
-0
lisp/apropos.el
lisp/apropos.el
+1
-1
lisp/bookmark.el
lisp/bookmark.el
+1
-1
lisp/desktop.el
lisp/desktop.el
+2
-2
lisp/dired-aux.el
lisp/dired-aux.el
+1
-1
lisp/dnd.el
lisp/dnd.el
+1
-1
lisp/echistory.el
lisp/echistory.el
+1
-1
lisp/ediff-util.el
lisp/ediff-util.el
+3
-3
lisp/files.el
lisp/files.el
+1
-1
lisp/hi-lock.el
lisp/hi-lock.el
+1
-1
lisp/ibuf-macs.el
lisp/ibuf-macs.el
+1
-1
lisp/image-mode.el
lisp/image-mode.el
+2
-2
lisp/isearch.el
lisp/isearch.el
+1
-1
lisp/iswitchb.el
lisp/iswitchb.el
+1
-1
lisp/log-edit.el
lisp/log-edit.el
+2
-2
lisp/pcomplete.el
lisp/pcomplete.el
+1
-1
lisp/pcvs.el
lisp/pcvs.el
+1
-1
lisp/printing.el
lisp/printing.el
+4
-4
lisp/server.el
lisp/server.el
+1
-1
lisp/ses.el
lisp/ses.el
+2
-2
No files found.
lisp/ChangeLog
View file @
8a26c165
2005-09-18 D Goel <deego@gnufans.org>
* apropos.el (apropos-command): Fix `message' call: first arg
should be a format spec. In this and all other cases that appear
below and elsewhere in the source code, I made a change only when
two conditions were satisfied: [1] I can think of a possibility
that the arguments would cause an error, for example, the code is
question relies on extarnal variables such as filenames. [2] I was
sure that the arg to `message' could not have been nil in the
code.
* textmodes/tildify.el (tildify-region): Ditto.
* textmodes/reftex-index.el (reftex-index-change-entry)
(reftex-index-phrase-selection-or-word)
(reftex-query-index-phrase): Ditto.
* textmodes/reftex-dcr.el (reftex-echo-ref, reftex-echo-cite): Ditto.
* textmodes/org.el (org-complete, org-deadline, org-schedule)
(org-priority, org-table-sum): Ditto.
* textmodes/ispell.el (ispell-check-version)
(ispell-parse-output): Ditto.
* textmodes/flyspell.el (flyspell-mode-on)
(flyspell-notify-misspell, flyspell-word)
(flyspell-display-next-corrections): Ditto.
* textmodes/bibtex.el (bibtex-print-help-message): Ditto.
* textmodes/artist.el (artist-key-set-point-poly): Ditto.
* term/mac-win.el (mac-services-insert-text): Ditto.
* progmodes/vhdl-mode.el (vhdl-warning, vhdl-print-warnings)
(vhdl-hooked-abbrev, vhdl-template-insert-fun)
(vhdl-port-paste-testbench, vhdl-compose-new-component)
(vhdl-compose-configuration): Ditto.
* progmodes/sh-script.el (sh-blink, sh-show-indent)
(sh-set-indent, sh-learn-line-indent): Ditto.
* progmodes/ps-mode.el (ps-mode-target-column): Ditto.
* progmodes/idlwave.el (idlwave-make-tags)
(idlwave-scan-library-catalogs): Ditto.
* progmodes/idlw-shell.el (idlwave-shell-parse-stack-and-display): Ditto.
* progmodes/gud.el (gud-jdb-analyze-source): Ditto.
* progmodes/flymake.el (flymake-log): Ditto.
* progmodes/ebnf2ps.el (ebnf-generate-region): Ditto.
* progmodes/cmacexp.el (c-macro-expansion): Ditto.
* progmodes/ada-xref.el (ada-treat-cmd-string): Ditto.
* progmodes/ada-mode.el (ada-create-case-exception-substring)
(ada-justified-indent-current, ada-batch-reformat): Ditto.
* play/zone.el (zone): Ditto.
* play/landmark.el (lm-move): Ditto.
* play/decipher.el (decipher-show-alphabet): Ditto.
* net/newsticker.el (newsticker--display-jump)
(newsticker--display-scroll): Ditto.
* mail/rmail-spam-filter.el (rsf-add-subject-to-spam-list)
(rsf-add-sender-to-spam-list, rsf-add-region-to-spam-list): Ditto.
* mail/feedmail.el (feedmail-dump-message-to-queue): Ditto.
* eshell/esh-proc.el (eshell-remove-process-entry): Ditto.
* emulation/ws-mode.el (ws-last-error): Ditto.
* emulation/viper-macs.el (ex-map-read-args, ex-unmap-read-args)
(viper-record-kbd-macro): Ditto.
* emulation/viper-ex.el (ex-pwd, viper-info-on-file): Ditto.
* emacs-lisp/lisp-mnt.el (lm-report-bug): Ditto.
* emacs-lisp/find-func.el (find-function-noselect): Ditto.
* calendar/timeclock.el (timeclock-status-string)
(timeclock-workday-remaining-string)
(timeclock-workday-elapsed-string)
(timeclock-when-to-leave-string): Ditto.
* calendar/icalendar.el (icalendar--convert-ical-to-diary): Ditto.
* calc/calc-units.el (calc-enter-units-table): Ditto.
* calc/calc-mode.el (calc-mode-record-mode): Ditto.
* woman.el (woman-mini-help): Ditto.
* wdired.el (wdired-change-to-wdired-mode): Ditto.
* vc.el (vc-retrieve-snapshot): Ditto.
* strokes.el (strokes-read-stroke, strokes-read-complex-stroke): Ditto.
* startup.el (display-startup-echo-area-message): Ditto.
* simple.el (set-goal-column): Ditto.
* ses.el (ses-command-hook, ses-recalculate-cell): Ditto.
* server.el (server-process-filter): Ditto.
* printing.el (pr-interface-txt-print, pr-interface-printify)
(pr-interface-ps): Ditto.
* pcvs.el (cvs-help): Ditto.
* log-edit.el (log-edit, log-edit-mode-help): Ditto.
* iswitchb.el (iswitchb-possible-new-buffer): Ditto.
* isearch.el (isearch-edit-string): Ditto.
* image-mode.el (image-mode, image-minor-mode): Ditto.
* ibuf-macs.el (define-ibuffer-filter): Ditto.
* hi-lock.el (hi-lock-find-patterns): Ditto.
* files.el (toggle-read-only): Ditto.
* ediff-util.el (ediff-copy-diff)
(ediff-write-merge-buffer-and-maybe-kill): Ditto.
* echistory.el (Electric-history-undefined): Ditto.
* dnd.el (dnd-insert-text): Ditto.
* dired-aux.el (dired-query): Ditto.
* desktop.el (desktop-restore-file-buffer)
(desktop-lazy-create-buffer): Ditto.
* bookmark.el (bookmark-bmenu-locate): Ditto.
* obsolete/fast-lock.el (@top-level): Ditto in the macro definition of `with-temp-message'.
* pcomplete.el (pcomplete--help): Fix `message' format spec. Not
having a %s would be weird, though not technically wrong.
2005-09-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* term/mac-win.el (mac-add-charset-info): Doc fix.
...
...
lisp/apropos.el
View file @
8a26c165
...
...
@@ -443,7 +443,7 @@ satisfy the predicate VAR-PREDICATE."
(
setq
p
(
cdr
p
))))
(
and
(
apropos-print
t
nil
)
message
(
message
message
))))
(
message
"%s"
message
))))
;;;###autoload
...
...
lisp/bookmark.el
View file @
8a26c165
...
...
@@ -2058,7 +2058,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
(
interactive
)
(
if
(
bookmark-bmenu-check-position
)
(
let
((
bmrk
(
bookmark-bmenu-bookmark
)))
(
message
(
bookmark-location
bmrk
)))))
(
message
"%s"
(
bookmark-location
bmrk
)))))
(
defun
bookmark-bmenu-relocate
()
"Change the file path of the bookmark on the current line,
...
...
lisp/desktop.el
View file @
8a26c165
...
...
@@ -944,7 +944,7 @@ directory DIRNAME."
desktop-buffer-file-name
)))
(
if
desktop-missing-file-warning
(
y-or-n-p
(
concat
msg
" Re-create? "
))
(
message
msg
)
(
message
"%s"
msg
)
nil
)))
(
let*
((
auto-insert
nil
)
; Disable auto insertion
(
coding-system-for-read
...
...
@@ -1101,7 +1101,7 @@ ARGS must be an argument list for `desktop-create-buffer'."
(
msg
(
format
"Desktop lazily opening %s (%s remaining)..."
buffer-name
remaining
)))
(
when
desktop-lazy-verbose
(
message
msg
))
(
message
"%s"
msg
))
(
let
((
desktop-first-buffer
nil
)
(
desktop-buffer-ok-count
0
)
(
desktop-buffer-fail-count
0
))
...
...
lisp/dired-aux.el
View file @
8a26c165
...
...
@@ -845,7 +845,7 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.")
(
apply
'message
qprompt
qs-args
)
(
setq
char
(
set
qs-var
(
read-char
))))
;; Display the question with the answer.
(
message
(
concat
(
apply
'format
qprompt
qs-args
)
(
message
"%s"
(
concat
(
apply
'format
qprompt
qs-args
)
(
char-to-string
char
)))
(
memq
(
cdr
elt
)
'
(
t
y
yes
)))))))
...
...
lisp/dnd.el
View file @
8a26c165
...
...
@@ -179,7 +179,7 @@ TEXT is the text as a string, WINDOW is the window where the drop happened."
(
not
(
windowp
window
)))
(
progn
(
kill-new
text
)
(
message
(
message
"%s"
(
substitute-command-keys
"The dropped text can be accessed with \\[yank]"
)))
(
insert
text
))
...
...
lisp/echistory.el
View file @
8a26c165
...
...
@@ -140,7 +140,7 @@ The Command History listing is recomputed each time this mode is invoked."
(
defun
Electric-history-undefined
()
(
interactive
)
(
ding
)
(
message
(
substitute-command-keys
"Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute"
))
(
message
"%s"
(
substitute-command-keys
"Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute"
))
(
sit-for
4
))
(
defun
Electric-history-quit
()
...
...
lisp/ediff-util.el
View file @
8a26c165
...
...
@@ -2075,7 +2075,7 @@ ARG is a prefix argument. If nil, copy the current difference region."
(
ediff-clear-fine-differences
n
))
;; Make sure that the message about saving and how to restore is seen
;; by the user
(
message
messg
))
(
message
"%s"
messg
))
))
;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
...
...
@@ -2720,7 +2720,7 @@ only if this merge job is part of a group, i.e., was invoked from within
(
format
"Another buffer is visiting file %s. Too dangerous to save the merge buffer"
file
)))
(
beep
)
(
message
warn-message
)
(
message
"%s"
warn-message
)
(
with-output-to-temp-buffer
ediff-msg-buffer
(
princ
"\n\n"
)
(
princ
warn-message
)
...
...
@@ -3286,7 +3286,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
(
princ
warn-message
)
(
princ
"\n\n"
))
(
if
(
y-or-n-p
(
message
warn-message
))
(
message
"%s"
warn-message
))
(
with-current-buffer
buff
(
save-buffer
)
(
kill-buffer
(
current-buffer
)))
...
...
lisp/files.el
View file @
8a26c165
...
...
@@ -3580,7 +3580,7 @@ If visiting file read-only and `view-read-only' is non-nil, enter view mode."
(
t
(
setq
buffer-read-only
(
not
buffer-read-only
))
(
force-mode-line-update
)))
(
if
(
vc-backend
buffer-file-name
)
(
message
(
substitute-command-keys
(
message
"%s"
(
substitute-command-keys
(
concat
"File is under version-control; "
"use \\[vc-next-action] to check in/out"
))))))
...
...
lisp/hi-lock.el
View file @
8a26c165
...
...
@@ -564,7 +564,7 @@ Optional argument END is maximum excursion."
(
hi-lock-current-line
)))))))
(
when
hi-lock-mode
(
hi-lock-set-file-patterns
all-patterns
))
(
if
(
interactive-p
)
(
message
(
format
"Hi-lock added %d patterns."
(
length
all-patterns
))))))
)
(
message
"Hi-lock added %d patterns."
(
length
all-patterns
))))))
(
defun
hi-lock-font-lock-hook
()
"Add hi lock patterns to font-lock's."
...
...
lisp/ibuf-macs.el
View file @
8a26c165
...
...
@@ -281,7 +281,7 @@ bound to the current value of the filter.
,
(
concat
(
or
documentation
"This filter is not documented."
))
(
interactive
(
list
,
reader
))
(
ibuffer-push-filter
(
cons
',name
qualifier
))
(
message
(
message
"%s"
(
format
,
(
concat
(
format
"Filter by %s added: "
description
)
" %s"
)
qualifier
))
...
...
lisp/image-mode.el
View file @
8a26c165
...
...
@@ -66,7 +66,7 @@ to toggle between display as an image and display as text."
;; variables were cleared by kill-all-local-variables
(
setq
cursor-type
nil
truncate-lines
t
))
(
run-mode-hooks
'image-mode-hook
)
(
message
(
concat
(
substitute-command-keys
(
message
"%s"
(
concat
(
substitute-command-keys
"Type \\[image-toggle-display] to view the image as "
)
(
if
(
get-text-property
(
point-min
)
'display
)
"text"
"an image"
)
"."
)))
...
...
@@ -84,7 +84,7 @@ See the command `image-mode' for more information on this mode."
(
if
(
get-text-property
(
point-min
)
'display
)
(
setq
cursor-type
nil
truncate-lines
t
))
(
add-hook
'change-major-mode-hook
(
lambda
()
(
image-minor-mode
-1
))
nil
t
)
(
message
(
concat
(
substitute-command-keys
(
message
"%s"
(
concat
(
substitute-command-keys
"Type \\[image-toggle-display] to view the image as "
)
(
if
(
get-text-property
(
point-min
)
'display
)
"text"
"an image"
)
"."
))))
...
...
lisp/isearch.el
View file @
8a26c165
...
...
@@ -1016,7 +1016,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
;; read a key the normal way.
;; Word search does not apply (yet) to regexp searches,
;; no check is made here.
(message (isearch-message-prefix nil nil t))
(message
"
%s
"
(isearch-message-prefix nil nil t))
(if (memq (lookup-key isearch-mode-map (vector e))
'(isearch-yank-word
isearch-yank-word-or-char))
...
...
lisp/iswitchb.el
View file @
8a26c165
...
...
@@ -1122,7 +1122,7 @@ Return the modified list with the last element prepended to it."
(
set-buffer-major-mode
newbufcreated
))
(
iswitchb-visit-buffer
newbufcreated
))
;; else wont create new buffer
(
message
(
format
"no buffer matching `%s'"
buf
))))
)
(
message
"no buffer matching `%s'"
buf
))))
(
defun
iswitchb-window-buffer-p
(
buffer
)
"Return window pointer if BUFFER is visible in another frame.
...
...
lisp/log-edit.el
View file @
8a26c165
...
...
@@ -331,7 +331,7 @@ If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the
(
set
(
make-local-variable
'log-edit-initial-files
)
(
log-edit-files
))
(
when
setup
(
run-hooks
'log-edit-hook
))
(
goto-char
(
point-min
))
(
push-mark
(
point-max
))
(
message
(
substitute-command-keys
(
message
"%s"
(
substitute-command-keys
"Press \\[log-edit-done] when you are done editing."
))))
(
define-derived-mode
log-edit-mode
text-mode
"Log-Edit"
...
...
@@ -426,7 +426,7 @@ To select default log text, we:
(
interactive
)
(
if
(
eq
last-command
'log-edit-mode-help
)
(
describe-function
major-mode
)
(
message
(
message
"%s"
(
substitute-command-keys
"Type `\\[log-edit-done]' to finish commit. Try `\\[describe-function] log-edit-done' for more help."
))))
...
...
lisp/pcomplete.el
View file @
8a26c165
...
...
@@ -1138,7 +1138,7 @@ If specific documentation can't be given, be generic."
(
fboundp
'Info-goto-node
))
(
listp
pcomplete-help
)))
(
if
(
listp
pcomplete-help
)
(
message
(
eval
pcomplete-help
))
(
message
"%s"
(
eval
pcomplete-help
))
(
save-window-excursion
(
info
))
(
switch-to-buffer-other-window
"*info*"
)
(
funcall
(
symbol-function
'Info-goto-node
)
pcomplete-help
))
...
...
lisp/pcvs.el
View file @
8a26c165
...
...
@@ -1171,7 +1171,7 @@ Full documentation is in the Texinfo file."
(
interactive
)
(
if
(
eq
last-command
'cvs-help
)
(
describe-function
'cvs-mode
)
; would need minor-mode for log-edit-mode
(
message
(
message
"%s"
(
substitute-command-keys
"
`
\\[cvs-help]
'
:help
`
\\[cvs-mode-add]
'
:add
`
\\[cvs-mode-commit]
'
:commit
\
`
\\[cvs-mode-diff-map]
'
:diff*
`
\\[cvs-mode-log]
'
:log
\
...
...
lisp/printing.el
View file @
8a26c165
...
...
@@ -4,7 +4,7 @@
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Time-stamp: <2005
/06/11 19:51:32 vinicius
>
;; Time-stamp: <2005
-09-18 05:57:14 deego
>
;; Keywords: wp, print, PostScript
;; Version: 6.8.4
;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
...
...
@@ -6424,7 +6424,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
;; handlers
((
quit
error
)
(
ding
)
(
message
(
error-message-string
data
)))))
(
message
"%s"
(
error-message-string
data
)))))
(
defun
pr-interface-printify
(
&rest
ignore
)
...
...
@@ -6449,7 +6449,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
;; handlers
((
quit
error
)
(
ding
)
(
message
(
error-message-string
data
)))))
(
message
"%s"
(
error-message-string
data
)))))
(
defun
pr-interface-ps-print
(
&rest
ignore
)
...
...
@@ -6515,7 +6515,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
;; handlers
((
quit
error
)
(
ding
)
(
message
(
error-message-string
data
)))))
(
message
"%s"
(
error-message-string
data
)))))
(
defun
pr-i-ps-send
()
...
...
lisp/server.el
View file @
8a26c165
...
...
@@ -371,7 +371,7 @@ PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"."
(
server-switch-buffer
(
nth
1
client
))
(
run-hooks
'server-switch-hook
)
(
unless
nowait
(
message
(
substitute-command-keys
(
message
"%s"
(
substitute-command-keys
"When done with a buffer, type \\[server-edit]"
)))))
;; Avoid preserving the connection after the last real frame is deleted.
(
if
tmp-frame
(
delete-frame
tmp-frame
))))
...
...
lisp/ses.el
View file @
8a26c165
...
...
@@ -1612,7 +1612,7 @@ narrows the buffer now."
(
error
(
unless
executing-kbd-macro
(
ding
))
(
message
(
error-message-string
err
))))
(
message
"%s"
(
error-message-string
err
))))
nil
)
;Make coverage-tester happy
(
defun
ses-create-header-string
()
...
...
@@ -1739,7 +1739,7 @@ to are recalculated first."
(
error
(
setq
sig
hold
))))
(
cond
(
sig
(
message
(
error-message-string
sig
)))
(
message
"%s"
(
error-message-string
sig
)))
((
consp
ses--curcell
)
(
message
" "
))
(
t
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment