Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
This commit is contained in:
K. Handa
commit
3e0e2339cd
152 changed files with 2446 additions and 1393 deletions
928
ChangeLog.2
928
ChangeLog.2
|
|
@ -1,3 +1,929 @@
|
|||
2015-08-30 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* lisp/net/tramp-sh.el (tramp-convert-file-attributes):
|
||||
Revert patch from 2015-08-24. Tramp shall be have like for local files.
|
||||
* test/automated/tramp-tests.el (tramp-test18-file-attributes):
|
||||
Adapt test.
|
||||
|
||||
2015-08-30 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Text quoting fixes in cedet, emulation, emacs-lisp
|
||||
* lisp/cedet/ede.el (ede-check-project-directory):
|
||||
* lisp/cedet/semantic/analyze/debug.el:
|
||||
(semantic-analyzer-debug-insert-include-summary):
|
||||
* lisp/cedet/semantic/bovine/c.el (semantic-c-describe-environment):
|
||||
* lisp/cedet/semantic/decorate/include.el:
|
||||
(semantic-decoration-unknown-include-describe)
|
||||
(semantic-decoration-all-include-summary):
|
||||
* lisp/cedet/semantic/ia.el (semantic-ia-fast-jump):
|
||||
* lisp/emulation/edt.el (edt-load-keys):
|
||||
* lisp/emulation/viper-cmd.el:
|
||||
(viper-display-current-destructive-command)
|
||||
(viper-query-replace, viper-brac-function):
|
||||
* lisp/emulation/viper-ex.el (viper-get-ex-token, ex-compile):
|
||||
* lisp/emulation/viper-macs.el (viper-unrecord-kbd-macro):
|
||||
Respect text quoting style in doc string or diagnostic.
|
||||
* lisp/cedet/mode-local.el (describe-mode-local-overload):
|
||||
Use format-message to avoid overtranslating quotes.
|
||||
* lisp/emacs-lisp/checkdoc.el (checkdoc-in-sample-code-p):
|
||||
Escape an apostrophe in a docstring.
|
||||
* lisp/emacs-lisp/warnings.el (lwarn): Fix doc string.
|
||||
|
||||
2015-08-29 Daniel Colascione <dancol@dancol.org>
|
||||
|
||||
Fix which-func for curly quotes: look for symbol, not message
|
||||
* lisp/progmodes/which-func.el (which-func-ff-hook): Look for new
|
||||
imenu-unavailable error symbol instead of trying to match message
|
||||
exactly.
|
||||
* lisp/imenu.el (imenu-unavailable): New error
|
||||
(imenu-unavailable-error): New function.
|
||||
|
||||
2015-08-29 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Fix Python tests on MS-Windows
|
||||
* test/automated/python-tests.el
|
||||
(python-shell-calculate-command-1): Run python-shell-interpreter
|
||||
through shell-quote-argument before comparing with what
|
||||
python-shell-calculate-command returns.
|
||||
(python-shell-calculate-pythonpath-1)
|
||||
(python-shell-calculate-pythonpath-2)
|
||||
(python-shell-calculate-process-environment-2): Use path-separator
|
||||
instead of a literal ':'.
|
||||
(python-shell-calculate-exec-path-2)
|
||||
(python-shell-calculate-exec-path-3)
|
||||
(python-shell-calculate-exec-path-4)
|
||||
(python-shell-with-environment-1)
|
||||
(python-shell-with-environment-2): Run "/env/bin" through
|
||||
expand-file-name before comparing with exec-path. (Bug#21375)
|
||||
|
||||
2015-08-29 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
Use Core Text types/functions/variables/enumerators directly
|
||||
* src/macfont.h (FontDescriptorRef, FontRef, FontSymbolicTraits)
|
||||
(CharacterCollection): Remove typedefs. All uses replaced with
|
||||
definitions.
|
||||
(MAC_FONT_NAME_ATTRIBUTE, MAC_FONT_FAMILY_NAME_ATTRIBUTE)
|
||||
(MAC_FONT_TRAITS_ATTRIBUTE, MAC_FONT_SIZE_ATTRIBUTE)
|
||||
(MAC_FONT_CASCADE_LIST_ATTRIBUTE)
|
||||
(MAC_FONT_CHARACTER_SET_ATTRIBUTE, MAC_FONT_LANGUAGES_ATTRIBUTE)
|
||||
(MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_SYMBOLIC_TRAIT)
|
||||
(MAC_FONT_WEIGHT_TRAIT, MAC_FONT_WIDTH_TRAIT)
|
||||
(MAC_FONT_SLANT_TRAIT): Remove macros. All uses replaced with
|
||||
definitions.
|
||||
(MAC_FONT_TRAIT_ITALIC, MAC_FONT_TRAIT_BOLD)
|
||||
(MAC_FONT_TRAIT_MONO_SPACE, MAC_FONT_TRAIT_COLOR_GLYPHS)
|
||||
(MAC_FONT_FORMAT_BITMAP)
|
||||
(MAC_CHARACTER_COLLECTION_IDENTITY_MAPPING)
|
||||
(MAC_CHARACTER_COLLECTION_ADOBE_JAPAN1): Remove enumerators. All
|
||||
uses replaced with definitions.
|
||||
(kCTFontTraitItalic, kCTFontTraitBold, kCTFontTraitMonoSpace)
|
||||
(kCTFontTraitColorGlyphs, kCTCharacterCollectionIdentityMapping)
|
||||
(kCTCharacterCollectionAdobeJapan1 kCTFontOrientationDefault): Add
|
||||
compatibility enumerators for older versions.
|
||||
(mac_font_descriptor_create_with_attributes)
|
||||
(mac_font_descriptor_create_matching_font_descriptors)
|
||||
(mac_font_descriptor_create_matching_font_descriptor)
|
||||
(mac_font_descriptor_copy_attribute)
|
||||
(mac_font_descriptor_supports_languages)
|
||||
(mac_font_create_with_name, mac_font_get_size)
|
||||
(mac_font_copy_family_name, mac_font_copy_character_set)
|
||||
(mac_font_get_glyphs_for_characters, mac_font_get_ascent)
|
||||
(mac_font_get_descent, mac_font_get_leading)
|
||||
(mac_font_get_underline_position)
|
||||
(mac_font_get_underline_thickness, mac_font_copy_graphics_font)
|
||||
(mac_font_copy_non_synthetic_table): Remove macros. All uses
|
||||
replaced with definitions.
|
||||
(mac_font_create_preferred_family_for_attributes)
|
||||
(mac_font_get_advance_width_for_glyph)
|
||||
(mac_font_get_bounding_rect_for_glyph)
|
||||
(mac_font_create_available_families, mac_font_shape): Remove
|
||||
macros for renamed functions.
|
||||
(mac_nsctfont_copy_font_descriptor): Remove unused macro.
|
||||
* src/macterm.m (mac_font_descriptor_supports_languages): Rename
|
||||
from mac_ctfont_descriptor_supports_languages.
|
||||
(mac_font_create_preferred_family_for_attributes): Rename from
|
||||
mac_ctfont_create_preferred_family_for_attributes.
|
||||
(mac_font_get_advance_width_for_glyph): Rename from
|
||||
mac_ctfont_get_advance_width_for_glyph. Use
|
||||
kCTFontOrientationDefault also for older versions.
|
||||
(mac_font_get_bounding_rect_for_glyph): Rename from
|
||||
mac_ctfont_get_bounding_rect_for_glyph. Use
|
||||
kCTFontOrientationDefault also for older versions.
|
||||
(mac_font_create_available_families): Rename from
|
||||
mac_ctfont_create_available_families.
|
||||
(mac_font_equal_in_postscript_name): Rename from
|
||||
mac_ctfont_equal_in_postscript_name. All uses changed.
|
||||
(mac_font_create_line_with_string_and_font): Rename from
|
||||
mac_ctfont_create_line_with_string_and_font. All uses changed.
|
||||
(mac_font_shape): Rename from mac_ctfont_shape.
|
||||
(mac_font_family_compare): Remove unused declaration.
|
||||
|
||||
2015-08-29 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix minor text quoting in calc, calendar, vc
|
||||
* lisp/calc/calc-ext.el (calc-shift-Z-prefix-help):
|
||||
* lisp/calc/calc-help.el (calc-j-prefix-help):
|
||||
* lisp/calc/calc-misc.el (calc-help):
|
||||
* lisp/calc/calc.el (calc-algebraic-mode, calc-mode):
|
||||
Escape an apostrophe in a docstring.
|
||||
* lisp/calc/calc-forms.el (calc-hms-notation):
|
||||
* lisp/calc/calc-mode.el (calc-display-raw, calc-algebraic-mode):
|
||||
Escape an apostrophe in a diagnostic.
|
||||
* lisp/calc/calc-misc.el (calc-help):
|
||||
* lisp/calendar/diary-lib.el (diary-include-files):
|
||||
* lisp/calendar/todo-mode.el (todo-prefix, todo-item-mark):
|
||||
* lisp/vc/diff-mode.el (diff-delete-trailing-whitespace):
|
||||
* lisp/vc/ediff-diff.el (ediff-same-contents):
|
||||
* lisp/vc/ediff-merg.el (ediff-re-merge):
|
||||
* lisp/vc/ediff-ptch.el (ediff-patch-file-internal):
|
||||
* lisp/vc/ediff-util.el (ediff-test-save-region)
|
||||
(ediff-status-info):
|
||||
* lisp/vc/ediff.el (ediff-merge-revisions)
|
||||
(ediff-merge-revisions-with-ancestor):
|
||||
* lisp/vc/pcvs.el (cvs-mode-checkout, cvs-vc-command-advice):
|
||||
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
|
||||
Respect text quoting style in doc string or diagnostic.
|
||||
* lisp/calc/calc-prog.el (calc-kbd-push, calc-kbd-pop):
|
||||
* lisp/vc/add-log.el (change-log-goto-source):
|
||||
Avoid double-formatting.
|
||||
* lisp/vc/ediff-init.el (format-message):
|
||||
New backward-compatibility alias.
|
||||
|
||||
2015-08-28 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix minor text quoting problems in lisp top level
|
||||
* lisp/apropos.el (apropos-describe-plist):
|
||||
* lisp/cus-theme.el (customize-themes):
|
||||
* lisp/dired.el (dired-log):
|
||||
* lisp/help-fns.el (describe-variable):
|
||||
* lisp/hexl.el (hexl-insert-multibyte-char):
|
||||
* lisp/info.el (Info-finder-find-node):
|
||||
* lisp/json.el (json-read-string):
|
||||
* lisp/novice.el (disabled-command-function)
|
||||
(disabled-command-function):
|
||||
* lisp/startup.el (normal-mouse-startup-screen):
|
||||
* lisp/woman.el (WoMan-log, WoMan-warn):
|
||||
Respect text quoting style in doc string or diagnostic.
|
||||
* lisp/replace.el (replace-character-fold):
|
||||
* src/syntax.c (Fmodify_syntax_entry):
|
||||
Escape an apostrophe in a docstring.
|
||||
* lisp/tempo.el (tempo-define-template):
|
||||
Remove confusing apostrophe from docstring.
|
||||
* lisp/whitespace.el (whitespace-mark-x):
|
||||
Use directed quotes in docstring.
|
||||
|
||||
2015-08-28 Simen Heggestøyl <simenheg@gmail.com>
|
||||
|
||||
Fix indentation rule in css-mode
|
||||
* lisp/textmodes/css-mode.el (css-smie-rules): Fix indentation of
|
||||
brackets in presence of pseudo-selectors. (Bug#21328)
|
||||
|
||||
2015-08-28 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Fix a bug in recording a macro while flyspell-mode is active
|
||||
* lisp/subr.el (sit-for): Don't call read-event when recording a
|
||||
macro. (Bug#21329)
|
||||
|
||||
2015-08-27 Paul Eggert <eggert@Penguin.CS.UCLA.EDU>
|
||||
|
||||
Tweak startup screen quoting
|
||||
* lisp/startup.el (normal-splash-screen): Use standard
|
||||
"M-" abbrevation rather than a confusingly-different one.
|
||||
(normal-no-mouse-startup-screen): Follow ‘text-quoting-style’.
|
||||
|
||||
2015-08-27 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Add test case for ‘format’ bug and refactor
|
||||
* src/editfns.c (styled_format): Refactor internally, mostly by
|
||||
moving declarations closer to uses. This should not affect behavior.
|
||||
* test/automated/textprop-tests.el (textprop-tests-format): New test.
|
||||
|
||||
Fix ‘format’ bug with property offsets
|
||||
* src/editfns.c (styled_format): Fix recently-introduced ‘format’
|
||||
bug in calculating string property offsets (Bug#21351).
|
||||
|
||||
Use straight quotes in lib-src diagnostics
|
||||
These auxiliary programs can’t use Emacs’s text-quoting-style,
|
||||
and it’s too much trouble to redo that mechanism by hand.
|
||||
So just use straight quotes for now.
|
||||
* lib-src/ebrowse.c (main):
|
||||
* lib-src/emacsclient.c (decode_options, main):
|
||||
* lib-src/etags.c (Ada_help, default_C_help, Cplusplus_help)
|
||||
(Forth_help, HTML_help, Lisp_help, Makefile_help, Objc_help)
|
||||
(Perl_help, PHP_help, Python_help, Scheme_help, TeX_help, auto_help)
|
||||
(none_help, print_language_names, print_help, add_regex)
|
||||
(suggest_asking_for_help):
|
||||
* lib-src/make-docfile.c (write_c_args, scan_c_stream):
|
||||
Use straight quotes in diagnostics.
|
||||
|
||||
‘text-quoting-style’ fixes for admin
|
||||
* admin/admin.el (cusver-scan, cusver-check):
|
||||
* admin/authors.el (authors-canonical-file-name):
|
||||
* admin/bzrmerge.el (bzrmerge-missing):
|
||||
Respect ‘text-quoting-style’ in diagnostics.
|
||||
|
||||
2015-08-26 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Assume GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS
|
||||
This removes the need for GCPRO1 etc. Suggested by Stefan Monnier in:
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00918.html
|
||||
* doc/lispref/internals.texi (Writing Emacs Primitives):
|
||||
* etc/NEWS:
|
||||
Document the change.
|
||||
* src/alloc.c (gcprolist, dump_zombies, MAX_ZOMBIES, zombies)
|
||||
(nzombies, ngcs, avg_zombies, max_live, max_zombies, avg_live)
|
||||
(Fgc_status, check_gcpros, relocatable_string_data_p, gc-precise):
|
||||
* src/bytecode.c (mark_byte_stack) [BYTE_MARK_STACK]:
|
||||
* src/eval.c (gcpro_level) [DEBUG_GCPRO]:
|
||||
* src/lisp.h (struct handler.gcpro, struct gcpro, GC_MARK_STACK)
|
||||
(GC_USE_GCPROS_AS_BEFORE, GC_MAKE_GCPROS_NOOPS)
|
||||
(GC_MARK_STACK_CHECK_GCPROS, GC_USE_GCPROS_CHECK_ZOMBIES)
|
||||
(BYTE_MARK_STACK, GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6)
|
||||
(GCPRO7, UNGCPRO, RETURN_UNGCPRO):
|
||||
Remove. All uses removed. The code now assumes
|
||||
GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS.
|
||||
* src/bytecode.c (relocate_byte_stack):
|
||||
Rename from unmark_byte_stack, since it now only relocates.
|
||||
All callers changed.
|
||||
* src/frame.c (make_frame): Add an IF_LINT to pacify GCC 5.2
|
||||
with GCPROs removed.
|
||||
* src/systime.h: Use EMACS_LISP_H as the canary instead of GCPRO1.
|
||||
* test/automated/finalizer-tests.el (finalizer-basic)
|
||||
(finalizer-circular-reference, finalizer-cross-reference)
|
||||
(finalizer-error):
|
||||
* test/automated/generator-tests.el (cps-test-iter-close-finalizer):
|
||||
Remove tests, as they depend on gc-precise.
|
||||
|
||||
2015-08-26 Nicolas Petton <nicolas@petton.fr>
|
||||
|
||||
Improve seq-concatenate for new sequence types
|
||||
Use the new `seq-into-sequence' in seqs passed to `seq-concatenate' to
|
||||
ensure that concatenation happens on sequences only. This makes it
|
||||
possible to use `seq-concatenate' for new types of seqs.
|
||||
* lisp/emacs-lisp/seq.el (seq-into-sequence, seq-concatenate): New
|
||||
function used in `seq-concatenate'.
|
||||
* test/automated/seq-tests.el (test-seq-into-sequence): New unit test
|
||||
for seq-into-sequence.
|
||||
|
||||
2015-08-26 Stephen Leake <stephen_leake@stephe-leake.org>
|
||||
|
||||
Add mode local overrides to xref-find-definitions
|
||||
* lisp/cedet/mode-local.el (xref-mode-local--override-present,
|
||||
xref-mode-local-overload): New; add mode local overrides to
|
||||
xref-find-definitions.
|
||||
* test/automated/elisp-mode-tests.el: Add mode local override tests.
|
||||
(xref-elisp-test-run): Handle indented defuns.
|
||||
(xref-elisp-generic-*): Improve doc strings.
|
||||
* lisp/progmodes/elisp-mode.el (elisp-xref-find-def-functions): New.
|
||||
(elisp--xref-find-definitions): Use it.
|
||||
|
||||
Add mode local overrides to describe-function
|
||||
* lisp/cedet/mode-local.el (describe-mode-local-overload): New; add mode
|
||||
local overrides to describe-function.
|
||||
* etc/NEWS: Document change.
|
||||
|
||||
2015-08-26 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Prefer straight quoting in some etc text files
|
||||
These files are plain text and might be used by non-Emacs apps.
|
||||
They’re mostly ASCII, so just use straight quotes.
|
||||
|
||||
Fix quoting in ‘message_with_string’
|
||||
* src/nsfont.m (nsfont_open): Use directed quotes in format; they
|
||||
should work now.
|
||||
* src/xdisp.c (message_to_stderr): New function, refactored from
|
||||
part of ‘message3_nolog’.
|
||||
(message3_nolog): Use it.
|
||||
(message_with_string): Use it. Don’t mishandle NUL bytes when
|
||||
noninteractive. Prefer AUTO_STRING when it’s most likely faster.
|
||||
Use ‘format-message’, not ‘format’, so that quotes are translated.
|
||||
|
||||
2015-08-26 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Mention false positives of file-accessible-directory on w32
|
||||
* src/fileio.c (Ffile_accessible_directory_p): Doc fix.
|
||||
(Bug#21346)
|
||||
|
||||
2015-08-26 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Treat error strings as help
|
||||
* src/print.c (print_error_message): Translate quotes and command
|
||||
keys in errmsg so that users see, e.g., "Symbol’s value as
|
||||
variable is void: foo" when text-quoting-style is curved.
|
||||
|
||||
2015-08-26 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* lisp/net/tramp-cache.el (top): Use `message' but `format-message'.
|
||||
|
||||
2015-08-26 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Top-level elisp files respect ‘text-quoting-style’
|
||||
In top-level elisp files, use format-message in diagnostic formats,
|
||||
so that they follow user preference as per ‘text-quoting-style’
|
||||
rather than being hard-coded to quote `like this'.
|
||||
* lisp/allout.el (allout-get-configvar-values):
|
||||
* lisp/apropos.el (apropos-symbols-internal):
|
||||
* lisp/dired-aux.el (dired-do-shell-command, dired-create-files)
|
||||
(dired-do-create-files-regexp, dired-create-files-non-directory):
|
||||
* lisp/dired-x.el (dired-do-run-mail):
|
||||
* lisp/dired.el (dired-log, dired-dnd-handle-local-file):
|
||||
* lisp/disp-table.el (standard-display-european):
|
||||
* lisp/find-dired.el (find-dired):
|
||||
* lisp/forms.el (forms-mode):
|
||||
* lisp/ido.el (ido-buffer-internal):
|
||||
* lisp/info.el (Info-index-next):
|
||||
* lisp/outline.el (outline-invent-heading):
|
||||
* lisp/printing.el (pr-ps-outfile-preprint, pr-i-ps-send):
|
||||
* lisp/proced.el (proced-log):
|
||||
* lisp/ps-print.el (ps-print-preprint, ps-get-size):
|
||||
* lisp/recentf.el (recentf-open-files, recentf-save-list):
|
||||
* lisp/savehist.el (savehist-save):
|
||||
* lisp/server.el (server-ensure-safe-dir):
|
||||
* lisp/ses.el (ses-rename-cell):
|
||||
* lisp/simple.el (list-processes--refresh):
|
||||
* lisp/startup.el (command-line):
|
||||
* lisp/strokes.el (strokes-unset-last-stroke)
|
||||
(strokes-execute-stroke):
|
||||
Use format-message so that quotes are restyled.
|
||||
* lisp/cus-edit.el (custom-raised-buttons, customize-browse):
|
||||
Don’t quote ‘raised’.
|
||||
* lisp/descr-text.el (describe-char):
|
||||
* lisp/dirtrack.el (dirtrack-debug-message):
|
||||
* lisp/hexl.el (hexl-insert-multibyte-char):
|
||||
Apply substitute-command-keys to help string.
|
||||
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
|
||||
(wdired-do-perm-changes):
|
||||
Let dired-log do the formatting.
|
||||
|
||||
2015-08-25 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Go back to grave quoting in Tramp
|
||||
* lisp/net/tramp-adb.el:
|
||||
* lisp/net/tramp-cache.el:
|
||||
* lisp/net/tramp-compat.el:
|
||||
* lisp/net/tramp-gvfs.el:
|
||||
* lisp/net/tramp-gw.el:
|
||||
* lisp/net/tramp-sh.el:
|
||||
* lisp/net/tramp-smb.el:
|
||||
* lisp/net/tramp.el:
|
||||
Stick with grave quoting in diagnostics strings. This is more
|
||||
portable to older Emacs, desirable for Tramp.
|
||||
* lisp/net/tramp-cache.el: Use ‘format-message’, not ‘format’,
|
||||
for diagnostic that needs requoting.
|
||||
* lisp/net/tramp-compat.el (format-message):
|
||||
Fall back on simple ‘format’, since that’s good enough now.
|
||||
|
||||
Go back to grave quoting in Gnus
|
||||
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
|
||||
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
|
||||
(gnus-agent-fetch-headers):
|
||||
* lisp/gnus/gnus-int.el (gnus-start-news-server):
|
||||
* lisp/gnus/gnus-registry.el:
|
||||
(gnus-registry--split-fancy-with-parent-internal)
|
||||
(gnus-registry-post-process-groups):
|
||||
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
|
||||
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
|
||||
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
|
||||
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
|
||||
* lisp/gnus/spam.el (spam-check-blackholes):
|
||||
Stick with grave quoting in diagnostics strings. This is more
|
||||
portable to older Emacs, desirable for Gnus.
|
||||
|
||||
Fix customization of text-quoting-style
|
||||
* lisp/cus-edit.el (custom-guess-type, custom-variable-documentation):
|
||||
* lisp/wid-edit.el (widget-docstring):
|
||||
Get raw docstring here since it’s cooked later and should not be
|
||||
cooked twice.
|
||||
* lisp/cus-edit.el (custom-group-value-create):
|
||||
Cook the docstring before inserting it.
|
||||
* lisp/cus-start.el (text-quoting-style): Quote the customization
|
||||
docstrings according to the new rules. Give curved examples.
|
||||
|
||||
format-message now curves ` and '
|
||||
That way, the caller doesn’t have to use curved quotes to
|
||||
get diagnostics that match the text-quoting-style preferences.
|
||||
Suggested by Dmitry Gutov in:
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00893.html
|
||||
This means we no longer need %qs, so remove that format.
|
||||
While we’re at it, fix an unlikely bug and lessen the pressure
|
||||
on the garbage collector by processing the string once rather
|
||||
than twice in the usual case.
|
||||
* doc/lispref/strings.texi (Formatting Strings):
|
||||
* etc/NEWS: Document this.
|
||||
* lisp/subr.el (format-message): Remove; now done in C.
|
||||
* src/callint.c (Fcall_interactively):
|
||||
* src/editfns.c (Fmessage, Fmessage_box):
|
||||
Use Fformat_message instead of Finternal__text_restyle
|
||||
followed by Fformat.
|
||||
* src/doc.c (LSQM, RSQM): Remove; all uses changed to use
|
||||
uLSQM and uRSQM.
|
||||
(Fsubstitute_command_keys): Prefer AUTO_STRING to build_string
|
||||
when pure ASCII now suffices. Fix unlikely bug when parsing
|
||||
unibyte string containing non-ASCII bytes. Use inline code
|
||||
rather than memcpy, as it’s a tiny number of bytes.
|
||||
(Finternal__text_restyle): Remove; no longer used.
|
||||
(syms_of_doc): Don’t declare it.
|
||||
* src/editfns.c (Fformat): Rewrite in terms of new function
|
||||
‘styled_format’.
|
||||
(Fformat_message): New function, moved here from subr.el.
|
||||
(styled_format): New function, with the old guts of Fformat,
|
||||
except it now optionally transliterates quotes, and it transliterates
|
||||
traditional grave accent and apostrophe quoting as well.
|
||||
Remove recently-added q flag; no longer needed or used.
|
||||
(syms_of_editfns): Define format-message.
|
||||
* src/lisp.h (uLSQM0, uLSQM1, uLSQM2, uRSQM0, uRSQM1, uRSQM2):
|
||||
Remove; no longer need to be global symbols.
|
||||
* src/xdisp.c (vadd_to_log): Use Fformat_message, not Fformat,
|
||||
so that callers can use `%s'.
|
||||
* src/image.c (image_size_error, xbm_load_image, xbm_load)
|
||||
(xpm_load, pbm_load, png_load_body, jpeg_load_body, tiff_load)
|
||||
(gif_load, imagemagick_load_image, imagemagick_load, svg_load)
|
||||
(svg_load_image, gs_load, x_kill_gs_process):
|
||||
* src/lread.c (load_warn_old_style_backquotes):
|
||||
* src/xfaces.c (load_pixmap):
|
||||
* src/xselect.c (x_clipboard_manager_error_1):
|
||||
Use `%s' instead of %qs in formats.
|
||||
|
||||
2015-08-25 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Minor fixes in doc/emacs/search.texi
|
||||
* doc/emacs/search.texi (Basic Isearch): Fix a typo.
|
||||
(Special Isearch): Use @w{} to generate several consecutive spaces
|
||||
with Texinfo 6. (Bug#21345)
|
||||
|
||||
2015-08-25 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* lisp/net/tramp-sh.el (tramp-awk-encode, tramp-awk-decode)
|
||||
(tramp-awk-coding-test): New defconsts.
|
||||
(tramp-remote-coding-commands): Use them.
|
||||
(tramp-find-inline-encoding): Check for Perl only if necessary.
|
||||
|
||||
2015-08-25 Xue Fuqiao <xfq.free@gmail.com>
|
||||
|
||||
* doc/lispintro/emacs-lisp-intro.texi (Run a Program): Add some
|
||||
index entries for the special form `quote'.
|
||||
|
||||
2015-08-25 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Spelling fixes
|
||||
|
||||
Gnus format-message typo fix
|
||||
* lisp/gnus/gnus-util.el (gnus-format-message):
|
||||
Fix typo when running in older Emacs.
|
||||
|
||||
Prefer directed to neutral quotes
|
||||
Prefer directed to neutral quotes in docstings and diagnostics.
|
||||
In docstrings, escape apostrophes that would otherwise be translated
|
||||
to curved quotes using the newer, simpler rules.
|
||||
* admin/unidata/unidata-gen.el (unidata-gen-table):
|
||||
* lisp/align.el (align-region):
|
||||
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
|
||||
* lisp/bookmark.el (bookmark-default-annotation-text):
|
||||
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
|
||||
* lisp/calc/calc-lang.el (math-read-giac-subscr)
|
||||
(math-read-math-subscr):
|
||||
* lisp/calc/calc-misc.el (report-calc-bug):
|
||||
* lisp/calc/calc-prog.el (calc-fix-token-name)
|
||||
(calc-read-parse-table-part):
|
||||
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
|
||||
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
|
||||
* lisp/dabbrev.el (dabbrev-expand):
|
||||
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
|
||||
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
|
||||
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
|
||||
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
|
||||
* lisp/erc/erc-button.el (erc-nick-popup):
|
||||
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
|
||||
* lisp/eshell/em-dirs.el (eshell/cd):
|
||||
* lisp/eshell/em-glob.el (eshell-glob-regexp):
|
||||
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
|
||||
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
|
||||
* lisp/eshell/esh-opt.el (eshell-show-usage):
|
||||
* lisp/files-x.el (modify-file-local-variable):
|
||||
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
|
||||
(filesets-update-pre010505):
|
||||
* lisp/find-cmd.el (find-generic, find-to-string):
|
||||
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
|
||||
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
|
||||
(gnus-agent-fetch-headers):
|
||||
* lisp/gnus/gnus-int.el (gnus-start-news-server):
|
||||
* lisp/gnus/gnus-registry.el:
|
||||
(gnus-registry--split-fancy-with-parent-internal):
|
||||
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
|
||||
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
|
||||
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
|
||||
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
|
||||
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
|
||||
* lisp/gnus/spam.el (spam-check-blackholes):
|
||||
* lisp/mail/feedmail.el (feedmail-run-the-queue):
|
||||
* lisp/mpc.el (mpc-playlist-rename):
|
||||
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
|
||||
* lisp/net/mairix.el (mairix-widget-create-query):
|
||||
* lisp/net/tramp-cache.el:
|
||||
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
|
||||
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
|
||||
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
|
||||
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
|
||||
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
|
||||
(org-babel-goto-named-result):
|
||||
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
|
||||
* lisp/org/ob-ref.el (org-babel-ref-resolve):
|
||||
* lisp/org/org-agenda.el (org-agenda-prepare):
|
||||
* lisp/org/org-bibtex.el (org-bibtex-fields):
|
||||
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
|
||||
(org-clock-resolve):
|
||||
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
|
||||
* lisp/org/org-habit.el (org-habit-parse-todo):
|
||||
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
|
||||
(org-mouse-context-menu):
|
||||
* lisp/org/org-table.el (org-table-edit-formulas):
|
||||
* lisp/org/ox.el (org-export-async-start):
|
||||
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
|
||||
(dun-rooms, dun-endgame-questions):
|
||||
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
|
||||
* lisp/progmodes/ada-xref.el (ada-find-executable):
|
||||
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
|
||||
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
|
||||
(flymake-start-syntax-check-process):
|
||||
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
|
||||
* lisp/progmodes/sql.el (sql-comint):
|
||||
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
|
||||
* lisp/server.el (server-get-auth-key):
|
||||
* lisp/subr.el (version-to-list):
|
||||
* lisp/textmodes/reftex-ref.el (reftex-label):
|
||||
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
|
||||
* lisp/vc/ediff-diff.el (ediff-same-contents):
|
||||
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
|
||||
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
|
||||
Use directed rather than neutral quotes in diagnostics.
|
||||
|
||||
Treat ' like ’ even when not matching `
|
||||
This is simpler and easier to explain, and should encourage better
|
||||
typography. Do this in Electric Quote mode and when translating
|
||||
quotes in docstrings. Inspired by a suggestion by Dmitry Gutov in:
|
||||
https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00806.html
|
||||
* doc/emacs/text.texi (Quotation Marks):
|
||||
* doc/lispref/help.texi (Keys in Documentation):
|
||||
* etc/NEWS:
|
||||
Document this.
|
||||
* lisp/electric.el (electric-quote-post-self-insert-function):
|
||||
* src/doc.c (Fsubstitute_command_keys):
|
||||
Always treat ' like ’ even when not matched by an open quote.
|
||||
|
||||
2015-08-25 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* doc/emacs/cal-xtra.texi (Holiday Customizing): Fix typo in example.
|
||||
* lisp/calendar/holidays.el (calendar-holidays): Fix doc typo.
|
||||
|
||||
2015-08-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
* src/macfont.m (macfont_create_family_with_symbol): Accept localized names.
|
||||
|
||||
2015-08-24 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Tramp diagnostics as per ‘text-quoting-style’
|
||||
* lisp/net/tramp-adb.el (tramp-adb-handle-file-truename)
|
||||
(tramp-adb-get-ls-command, tramp-adb-handle-make-directory)
|
||||
(tramp-adb-handle-delete-directory)
|
||||
(tramp-adb-handle-delete-file)
|
||||
(tramp-adb-handle-file-local-copy)
|
||||
(tramp-adb-handle-write-region, tramp-adb-handle-copy-file)
|
||||
(tramp-adb-send-command-and-check, tramp-adb-wait-for-output)
|
||||
(tramp-adb-maybe-open-connection):
|
||||
* lisp/net/tramp-cache.el:
|
||||
* lisp/net/tramp-compat.el (tramp-compat-temporary-file-directory)
|
||||
(tramp-compat-octal-to-decimal)
|
||||
(tramp-compat-coding-system-change-eol-conversion):
|
||||
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler)
|
||||
(tramp-gvfs-do-copy-or-rename-file)
|
||||
(tramp-gvfs-handle-delete-directory)
|
||||
(tramp-gvfs-handle-delete-file)
|
||||
(tramp-gvfs-handle-expand-file-name)
|
||||
(tramp-gvfs-handle-file-local-copy)
|
||||
(tramp-gvfs-handle-file-notify-add-watch)
|
||||
(tramp-gvfs-handle-make-directory)
|
||||
(tramp-gvfs-handle-write-region, tramp-gvfs-url-file-name):
|
||||
* lisp/net/tramp-gw.el (tramp-gw-gw-proc-sentinel)
|
||||
(tramp-gw-aux-proc-sentinel, tramp-gw-open-connection):
|
||||
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename)
|
||||
(tramp-sh-handle-set-visited-file-modtime)
|
||||
(tramp-sh-handle-set-file-modes)
|
||||
(tramp-sh-handle-file-name-all-completions)
|
||||
(tramp-sh-handle-add-name-to-file, tramp-do-copy-or-rename-file)
|
||||
(tramp-do-copy-or-rename-file-directly)
|
||||
(tramp-do-copy-or-rename-file-out-of-band)
|
||||
(tramp-sh-handle-make-directory)
|
||||
(tramp-sh-handle-delete-directory, tramp-sh-handle-delete-file)
|
||||
(tramp-sh-handle-insert-directory, tramp-process-sentinel)
|
||||
(tramp-sh-handle-start-file-process)
|
||||
(tramp-sh-handle-file-local-copy)
|
||||
(tramp-sh-handle-write-region, tramp-sh-handle-vc-registered)
|
||||
(tramp-sh-handle-file-notify-add-watch, tramp-maybe-send-script)
|
||||
(tramp-find-file-exists-command, tramp-open-shell)
|
||||
(tramp-find-shell)
|
||||
(tramp-open-connection-setup-interactive-shell)
|
||||
(tramp-find-inline-encoding, tramp-find-inline-compress)
|
||||
(tramp-compute-multi-hops, tramp-maybe-open-connection)
|
||||
(tramp-wait-for-output, tramp-send-command-and-check)
|
||||
(tramp-send-command-and-read, tramp-get-remote-path)
|
||||
(tramp-get-ls-command, tramp-get-ls-command-with-dired)
|
||||
(tramp-get-ls-command-with-quoting-style)
|
||||
(tramp-get-test-command, tramp-get-remote-ln)
|
||||
(tramp-get-remote-perl, tramp-get-remote-stat)
|
||||
(tramp-get-remote-readlink, tramp-get-remote-trash)
|
||||
(tramp-get-remote-touch, tramp-get-remote-gvfs-monitor-dir)
|
||||
(tramp-get-remote-inotifywait, tramp-get-remote-id)
|
||||
(tramp-get-remote-python):
|
||||
* lisp/net/tramp-smb.el (tramp-smb-errors)
|
||||
(tramp-smb-handle-add-name-to-file, tramp-smb-handle-copy-file)
|
||||
(tramp-smb-handle-delete-directory)
|
||||
(tramp-smb-handle-delete-file)
|
||||
(tramp-smb-handle-file-local-copy)
|
||||
(tramp-smb-handle-make-directory)
|
||||
(tramp-smb-handle-make-directory-internal)
|
||||
(tramp-smb-handle-make-symbolic-link)
|
||||
(tramp-smb-handle-rename-file, tramp-smb-handle-set-file-acl)
|
||||
(tramp-smb-handle-set-file-modes)
|
||||
(tramp-smb-handle-write-region, tramp-smb-get-file-entries):
|
||||
* lisp/net/tramp.el (tramp-debug-message, tramp-error)
|
||||
(tramp-process-actions):
|
||||
Generate diagnostics according to ‘text-quoting-style’, by
|
||||
using curved quotes in format strings and ‘format-message’
|
||||
when appropriate.
|
||||
* lisp/net/tramp-compat.el (format-message):
|
||||
Define a replacement, if it’s an older version of Emacs
|
||||
that doesn’t have it already.
|
||||
|
||||
* etc/NEWS: Clarify text-quoting-style and electric-quote-mode.
|
||||
|
||||
2015-08-24 Xue Fuqiao <xfq.free@gmail.com>
|
||||
|
||||
Fix documentation for `save-excursion'
|
||||
* doc/lispref/positions.texi (Excursions):
|
||||
* doc/lispintro/emacs-lisp-intro.texi (save-excursion)
|
||||
(Template for save-excursion, Point and mark): `save-excursion'
|
||||
does not save&restore the mark any more.
|
||||
|
||||
2015-08-24 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* lisp/net/tramp-sh.el (tramp-stat-marker, tramp-stat-quoted-marker):
|
||||
New defconsts.
|
||||
(tramp-do-file-attributes-with-stat)
|
||||
(tramp-do-directory-files-and-attributes-with-stat): Use them.
|
||||
(tramp-convert-file-attributes): Remove double slashes in symlinks.
|
||||
* test/automated/tramp-tests.el (tramp-test18-file-attributes):
|
||||
Handle symlinks with "//" in the file name.
|
||||
|
||||
Revert fbb5531fa11d13854b274d28ccd329c9b6652cfc for tramp.el.
|
||||
|
||||
2015-08-24 Nicolas Petton <nicolas@petton.fr>
|
||||
|
||||
Fix cl-subseq and cl-concatenate
|
||||
* lisp/emacs-lisp/cl-extra.el (cl-subseq, cl-concatenate): Do not use
|
||||
seq functions.
|
||||
* lisp/emacs-lisp/seq.el (seq-concatenate): Call cl-concatenate in
|
||||
seq-concatenate.
|
||||
|
||||
2015-08-24 Pip Cet <pipcet@gmail.com> (tiny change)
|
||||
|
||||
Fix full-screen code when there is no window manager (Bug#21317)
|
||||
* src/xterm.h (x_wm_supports): Declare external.
|
||||
* src/xterm.c (wm_suppports): Rename to `x_wm_supports', export.
|
||||
(do_ewmh_fullscreen, x_ewmh_activate_frame): Adjust for rename.
|
||||
(x_check_fullscreen): Call `x_wm_set_size_hint', restore
|
||||
`fullscreen' frame parameter.
|
||||
* gtkutil.c (x_wm_set_size_hint): Set size hints when running
|
||||
without a window manager.
|
||||
|
||||
2015-08-24 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* lisp/version.el (emacs-version): No longer include build host
|
||||
* doc/lispref/intro.texi (Version Info): Update example.
|
||||
|
||||
2015-08-24 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* doc/lispref/elisp.texi: Fix typo in previous change.
|
||||
|
||||
More-conservative ‘format’ quote restyling
|
||||
Instead of restyling curved quotes for every call to ‘format’,
|
||||
create a new function ‘format-message’ that does the restyling,
|
||||
and using the new function instead of ‘format’ only in contexts
|
||||
where this seems appropriate.
|
||||
Problem reported by Dmitry Gutov and Andreas Schwab in:
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html
|
||||
* doc/lispref/commands.texi (Using Interactive):
|
||||
* doc/lispref/control.texi (Signaling Errors, Signaling Errors):
|
||||
* doc/lispref/display.texi (Displaying Messages, Progress):
|
||||
* doc/lispref/elisp.texi:
|
||||
* doc/lispref/help.texi (Keys in Documentation):
|
||||
* doc/lispref/minibuf.texi (Minibuffer Misc):
|
||||
* doc/lispref/strings.texi (Formatting Strings):
|
||||
* etc/NEWS:
|
||||
Document the changes.
|
||||
* lisp/abbrev.el (expand-region-abbrevs):
|
||||
* lisp/apropos.el (apropos-library):
|
||||
* lisp/calc/calc-ext.el (calc-record-message)
|
||||
(calc-user-function-list):
|
||||
* lisp/calc/calc-help.el (calc-describe-key, calc-full-help):
|
||||
* lisp/calc/calc-lang.el (math-read-big-balance):
|
||||
* lisp/calc/calc-store.el (calc-edit-variable):
|
||||
* lisp/calc/calc-units.el (math-build-units-table-buffer):
|
||||
* lisp/calc/calc-yank.el (calc-edit-mode):
|
||||
* lisp/calendar/icalendar.el (icalendar-export-region)
|
||||
(icalendar--add-diary-entry):
|
||||
* lisp/cedet/mode-local.el (mode-local-print-binding)
|
||||
(mode-local-describe-bindings-2):
|
||||
* lisp/cedet/semantic/complete.el (semantic-completion-message):
|
||||
* lisp/cedet/semantic/edit.el (semantic-parse-changes-failed):
|
||||
* lisp/cedet/semantic/wisent/comp.el (wisent-log):
|
||||
* lisp/cedet/srecode/insert.el (srecode-insert-show-error-report):
|
||||
* lisp/descr-text.el (describe-text-properties-1, describe-char):
|
||||
* lisp/dframe.el (dframe-message):
|
||||
* lisp/dired-aux.el (dired-query):
|
||||
* lisp/emacs-lisp/byte-opt.el (byte-compile-log-lap-1):
|
||||
* lisp/emacs-lisp/bytecomp.el (byte-compile-log)
|
||||
(byte-compile-log-file, byte-compile-warn, byte-compile-form):
|
||||
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use)
|
||||
(cconv-analyze-form):
|
||||
* lisp/emacs-lisp/check-declare.el (check-declare-warn):
|
||||
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
|
||||
* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet):
|
||||
* lisp/emacs-lisp/edebug.el (edebug-format):
|
||||
* lisp/emacs-lisp/eieio-core.el (eieio-oref):
|
||||
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message)
|
||||
(eldoc-message):
|
||||
* lisp/emacs-lisp/elint.el (elint-file, elint-log):
|
||||
* lisp/emacs-lisp/find-func.el (find-function-library):
|
||||
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
|
||||
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
|
||||
* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
|
||||
* lisp/emacs-lisp/package.el (package-compute-transaction)
|
||||
(package-install-button-action, package-delete-button-action)
|
||||
(package-menu--list-to-prompt):
|
||||
* lisp/emacs-lisp/timer.el (timer-event-handler):
|
||||
* lisp/emacs-lisp/warnings.el (lwarn, warn):
|
||||
* lisp/emulation/viper-cmd.el:
|
||||
(viper-toggle-parse-sexp-ignore-comments)
|
||||
(viper-kill-buffer, viper-brac-function):
|
||||
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
|
||||
* lisp/facemenu.el (facemenu-add-new-face):
|
||||
* lisp/faces.el (face-documentation, read-face-name)
|
||||
(face-read-string, read-face-font, describe-face):
|
||||
* lisp/files.el (find-alternate-file, hack-local-variables)
|
||||
(hack-one-local-variable--obsolete, write-file)
|
||||
(basic-save-buffer, delete-directory):
|
||||
* lisp/format.el (format-write-file, format-find-file)
|
||||
(format-insert-file):
|
||||
* lisp/help-fns.el (help-fns--key-bindings)
|
||||
(help-fns--compiler-macro, help-fns--obsolete)
|
||||
(help-fns--interactive-only, describe-function-1)
|
||||
(describe-variable):
|
||||
* lisp/help.el (describe-mode):
|
||||
* lisp/info-xref.el (info-xref-output):
|
||||
* lisp/info.el (Info-virtual-index-find-node)
|
||||
(Info-virtual-index, info-apropos):
|
||||
* lisp/international/kkc.el (kkc-error):
|
||||
* lisp/international/mule-cmds.el:
|
||||
(select-safe-coding-system-interactively)
|
||||
(select-safe-coding-system, describe-input-method):
|
||||
* lisp/international/mule-conf.el (code-offset):
|
||||
* lisp/international/mule-diag.el (describe-character-set)
|
||||
(list-input-methods-1):
|
||||
* lisp/international/quail.el (quail-error):
|
||||
* lisp/minibuffer.el (minibuffer-message):
|
||||
* lisp/mpc.el (mpc--debug):
|
||||
* lisp/msb.el (msb--choose-menu):
|
||||
* lisp/net/ange-ftp.el (ange-ftp-message):
|
||||
* lisp/net/gnutls.el (gnutls-message-maybe):
|
||||
* lisp/net/newst-backend.el (newsticker--sentinel-work):
|
||||
* lisp/net/newst-treeview.el (newsticker--treeview-load):
|
||||
* lisp/net/nsm.el (nsm-query-user):
|
||||
* lisp/net/rlogin.el (rlogin):
|
||||
* lisp/net/soap-client.el (soap-warning):
|
||||
* lisp/net/tramp.el (tramp-debug-message):
|
||||
* lisp/nxml/nxml-outln.el (nxml-report-outline-error):
|
||||
* lisp/nxml/nxml-parse.el (nxml-parse-error):
|
||||
* lisp/nxml/rng-cmpct.el (rng-c-error):
|
||||
* lisp/nxml/rng-match.el (rng-compile-error):
|
||||
* lisp/nxml/rng-uri.el (rng-uri-error):
|
||||
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
|
||||
* lisp/org/org-ctags.el:
|
||||
(org-ctags-ask-rebuild-tags-file-then-find-tag):
|
||||
* lisp/proced.el (proced-log):
|
||||
* lisp/progmodes/ebnf2ps.el (ebnf-log):
|
||||
* lisp/progmodes/flymake.el (flymake-log):
|
||||
* lisp/progmodes/vhdl-mode.el (vhdl-warning-when-idle):
|
||||
* lisp/replace.el (occur-1):
|
||||
* lisp/simple.el (execute-extended-command)
|
||||
(undo-outer-limit-truncate, define-alternatives):
|
||||
* lisp/startup.el (command-line):
|
||||
* lisp/subr.el (error, user-error, add-to-list):
|
||||
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
|
||||
(tutorial--find-changed-keys):
|
||||
* src/callint.c (Fcall_interactively):
|
||||
* src/editfns.c (Fmessage, Fmessage_box):
|
||||
Restyle the quotes of format strings intended for use as a
|
||||
diagnostic, when restyling seems appropriate.
|
||||
* lisp/subr.el (format-message): New function.
|
||||
* src/doc.c (Finternal__text_restyle): New function.
|
||||
(syms_of_doc): Define it.
|
||||
|
||||
2015-08-23 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* etc/NEWS: The new ‘q’ flag is not an incompatible change.
|
||||
|
||||
2015-08-23 Fabián Ezequiel Gallina <fgallina@gnu.org>
|
||||
|
||||
python.el: Fix python-shell-buffer-substring on indented code
|
||||
(Bug#21086)
|
||||
* lisp/progmodes/python.el (python-shell-buffer-substring):
|
||||
Respect current line indentation when calculating string.
|
||||
* test/automated/python-tests.el
|
||||
(python-shell-buffer-substring-10)
|
||||
(python-shell-buffer-substring-11)
|
||||
(python-shell-buffer-substring-12): New tests.
|
||||
|
||||
2015-08-23 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix minor glitches from ‘format’ reversion
|
||||
* doc/lispref/strings.texi (Formatting Strings):
|
||||
After reversion, ‘text-quoting-style’ is documented in ‘Keys in
|
||||
Documentation’, not below.
|
||||
* src/syntax.c (Finternal_describe_syntax_value):
|
||||
Prefer AUTO_STRING to build_string where either will do, as
|
||||
AUTO_STRING is a bit faster.
|
||||
|
||||
2015-08-23 Fabián Ezequiel Gallina <fgallina@gnu.org>
|
||||
|
||||
python.el: Defer shell setup code until first interactive prompt
|
||||
* lisp/progmodes/python.el
|
||||
(python-shell-comint-watch-for-first-prompt-output-filter): New
|
||||
function.
|
||||
(inferior-python-mode): Use it.
|
||||
(python-shell-first-prompt-hook): New hook.
|
||||
(python-shell-send-setup-code)
|
||||
(python-shell-completion-native-turn-on-maybe-with-msg): Attach to
|
||||
this hook instead of inferior-python-hook.
|
||||
|
||||
2015-08-23 Nicolas Petton <nicolas@petton.fr>
|
||||
|
||||
Remove the calls to `seq-into` from `seq-concatenate`
|
||||
Since most new types of seq would have to be defined as sequences (cons
|
||||
cells or CL structs, mostly), there is no need to convert the seqs to
|
||||
sequences (which can be a fairly expensive operation).
|
||||
* lisp/emacs-lisp/seq.el (seq-concatenate): Do not ensure that seqs are
|
||||
sequences.
|
||||
|
||||
2015-08-23 Fabián Ezequiel Gallina <fgallina@gnu.org>
|
||||
|
||||
python.el: Fix completion for pdb interactions
|
||||
* lisp/progmodes/python.el (python-shell-completion-setup-code):
|
||||
Simplify. Toggle print_mode for native wrapped completer.
|
||||
(python-shell-completion-native-setup): Ensure process buffer.
|
||||
Add print_mode attribute to completer wrapper to toggle returning
|
||||
or printing candidates.
|
||||
(python-shell-completion-native-get-completions): Cleanup.
|
||||
(python-shell-completion-get-completions): Cleanup.
|
||||
(python-shell-completion-at-point): Perform prompt checks. Force
|
||||
fallback completion in pdb interactions.
|
||||
|
||||
2015-08-23 Nicolas Petton <nicolas@petton.fr>
|
||||
|
||||
Make seq.el more extensible by using cl-defmethod
|
||||
* lisp/emacs-lisp/seq.el: Define seq.el functions using cl-defmethod to
|
||||
make it easier to extend seq.el with new "seq types".
|
||||
* test/automated/seq-tests.el (test-setf-seq-elt): New test.
|
||||
* lisp/emacs-lisp/cl-extra.el (cl-subseq): Move back the definition of
|
||||
subseq in cl-extra.el, and use it in seq.el.
|
||||
|
||||
2015-08-23 Fabián Ezequiel Gallina <fgallina@gnu.org>
|
||||
|
||||
python.el: Fix prompt detection with user overridden interpreter
|
||||
* lisp/progmodes/python.el (python-shell-prompt-detect): Honor
|
||||
buffer local python-shell-interpreter and
|
||||
python-shell-interpreter-interactive-arg.
|
||||
|
||||
2015-08-23 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Support exec-directory with non-ASCII characters on Windows
|
||||
* src/w32proc.c (sys_spawnve): Make sure exec-directory is encoded
|
||||
in the system's ANSI codepage, when it is used for invoking
|
||||
cmdproxy.
|
||||
|
||||
2015-08-23 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
Revert "Extend ‘format’ to translate curved quotes"
|
||||
This reverts commit 244c801689d2f7a80480d83cd7d092d4762ebe08.
|
||||
|
||||
Revert "Prefer ‘format’ to ‘substitute-command-keys’"
|
||||
This reverts commit 6af5aad26411ffe21c3fe4bc5438347110910111.
|
||||
|
||||
2015-08-23 Xue Fuqiao <xfq.free@gmail.com>
|
||||
|
||||
* doc/lispintro/emacs-lisp-intro.texi (Switching Buffers): Clarify
|
||||
"invisible window".
|
||||
|
||||
2015-08-23 Xue Fuqiao <xfq.free@gmail.com>
|
||||
|
||||
* doc/emacs/modes.texi (Choosing Modes): Minor doc fix for
|
||||
|
|
@ -10469,7 +11395,7 @@
|
|||
|
||||
This file records repository revisions from
|
||||
commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
|
||||
commit a664f6a5d586e1f3fdbf31d0cf2fdaa6429a58fe (inclusive).
|
||||
commit cc90c25a50e536669ac327f7e05ec9194d1650d0 (inclusive).
|
||||
See ChangeLog.1 for earlier changes.
|
||||
|
||||
;; Local Variables:
|
||||
|
|
|
|||
|
|
@ -3862,10 +3862,10 @@ tiger!} will be printed; otherwise, @code{nil} will be returned.
|
|||
@group
|
||||
(defun type-of-animal (characteristic)
|
||||
"Print message in echo area depending on CHARACTERISTIC.
|
||||
If the CHARACTERISTIC is the symbol `fierce',
|
||||
If the CHARACTERISTIC is the symbol ‘fierce’,
|
||||
then warn of a tiger."
|
||||
(if (equal characteristic 'fierce)
|
||||
(message "It's a tiger!")))
|
||||
(message "It’s a tiger!")))
|
||||
@end group
|
||||
@end smallexample
|
||||
|
||||
|
|
@ -3887,7 +3887,7 @@ can evaluate the following two expressions to see the results:
|
|||
@c Following sentences rewritten to prevent overfull hbox.
|
||||
@noindent
|
||||
When you evaluate @code{(type-of-animal 'fierce)}, you will see the
|
||||
following message printed in the echo area: @code{"It's a tiger!"}; and
|
||||
following message printed in the echo area: @code{"It’s a tiger!"}; and
|
||||
when you evaluate @code{(type-of-animal 'zebra)} you will see @code{nil}
|
||||
printed in the echo area.
|
||||
|
||||
|
|
@ -3918,7 +3918,7 @@ The parts of the function that match this template look like this:
|
|||
@group
|
||||
(defun type-of-animal (characteristic)
|
||||
"Print message in echo area depending on CHARACTERISTIC.
|
||||
If the CHARACTERISTIC is the symbol `fierce',
|
||||
If the CHARACTERISTIC is the symbol ‘fierce’,
|
||||
then warn of a tiger."
|
||||
@var{body: the} @code{if} @var{expression})
|
||||
@end group
|
||||
|
|
@ -3948,7 +3948,7 @@ looks like this:
|
|||
@smallexample
|
||||
@group
|
||||
(if (equal characteristic 'fierce)
|
||||
(message "It's a tiger!")))
|
||||
(message "It’s a tiger!")))
|
||||
@end group
|
||||
@end smallexample
|
||||
|
||||
|
|
@ -3971,7 +3971,7 @@ In the first exercise of @code{type-of-animal}, the argument
|
|||
is equal to @code{fierce}, the expression, @code{(equal characteristic
|
||||
'fierce)}, returns a value of true. When this happens, the @code{if}
|
||||
evaluates the second argument or then-part of the @code{if}:
|
||||
@code{(message "It's tiger!")}.
|
||||
@code{(message "It’s a tiger!")}.
|
||||
|
||||
On the other hand, in the second exercise of @code{type-of-animal}, the
|
||||
argument @code{zebra} is passed to @code{type-of-animal}. @code{zebra}
|
||||
|
|
@ -4034,12 +4034,11 @@ arguments to the function.
|
|||
@group
|
||||
(defun type-of-animal (characteristic) ; @r{Second version.}
|
||||
"Print message in echo area depending on CHARACTERISTIC.
|
||||
If the CHARACTERISTIC is the symbol `fierce',
|
||||
then warn of a tiger;
|
||||
else say it's not fierce."
|
||||
If the CHARACTERISTIC is the symbol ‘fierce’,
|
||||
then warn of a tiger; else say it’s not fierce."
|
||||
(if (equal characteristic 'fierce)
|
||||
(message "It's a tiger!")
|
||||
(message "It's not fierce!")))
|
||||
(message "It’s a tiger!")
|
||||
(message "It’s not fierce!")))
|
||||
@end group
|
||||
@end smallexample
|
||||
@sp 1
|
||||
|
|
@ -4056,12 +4055,12 @@ else say it's not fierce."
|
|||
@c Following sentence rewritten to prevent overfull hbox.
|
||||
@noindent
|
||||
When you evaluate @code{(type-of-animal 'fierce)}, you will see the
|
||||
following message printed in the echo area: @code{"It's a tiger!"}; but
|
||||
following message printed in the echo area: @code{"It’s a tiger!"}; but
|
||||
when you evaluate @code{(type-of-animal 'zebra)}, you will see
|
||||
@code{"It's not fierce!"}.
|
||||
@code{"It’s not fierce!"}.
|
||||
|
||||
(Of course, if the @var{characteristic} were @code{ferocious}, the
|
||||
message @code{"It's not fierce!"} would be printed; and it would be
|
||||
message @code{"It’s not fierce!"} would be printed; and it would be
|
||||
misleading! When you write code, you need to take into account the
|
||||
possibility that some such argument will be tested by the @code{if}
|
||||
and write your program accordingly.)
|
||||
|
|
@ -4938,6 +4937,8 @@ result of this, point is placed at the beginning of the buffer and mark
|
|||
is set at the end of the buffer. The whole buffer is, therefore, the
|
||||
region.
|
||||
|
||||
@c FIXME: the definition of append-to-buffer has been changed (in
|
||||
@c 2010-03-30).
|
||||
@node append-to-buffer
|
||||
@section The Definition of @code{append-to-buffer}
|
||||
@findex append-to-buffer
|
||||
|
|
@ -6347,7 +6348,7 @@ With arg N, put point N/10 of the way
|
|||
from the true beginning.
|
||||
@end group
|
||||
@group
|
||||
Don't use this in Lisp programs!
|
||||
Don’t use this in Lisp programs!
|
||||
\(goto-char (point-min)) is faster
|
||||
and does not set the mark."
|
||||
(interactive "P")
|
||||
|
|
@ -7603,8 +7604,8 @@ Here is the complete text of the version 22 implementation of the function:
|
|||
@smallexample
|
||||
@group
|
||||
(defun zap-to-char (arg char)
|
||||
"Kill up to and including ARG'th occurrence of CHAR.
|
||||
Case is ignored if `case-fold-search' is non-nil in the current buffer.
|
||||
"Kill up to and including ARG’th occurrence of CHAR.
|
||||
Case is ignored if ‘case-fold-search’ is non-nil in the current buffer.
|
||||
Goes backward if ARG is negative; error if CHAR not found."
|
||||
(interactive "p\ncZap to char: ")
|
||||
(if (char-table-p translation-table-for-input)
|
||||
|
|
@ -7862,7 +7863,7 @@ to make one entry in the kill ring.
|
|||
|
||||
In Lisp code, optional third arg YANK-HANDLER, if non-nil,
|
||||
specifies the yank-handler text property to be set on the killed
|
||||
text. See `insert-for-yank'."
|
||||
text. See ‘insert-for-yank’."
|
||||
;; Pass point first, then mark, because the order matters
|
||||
;; when calling kill-append.
|
||||
(interactive (list (point) (mark)))
|
||||
|
|
@ -8290,9 +8291,9 @@ function:
|
|||
@smallexample
|
||||
@group
|
||||
(defun copy-region-as-kill (beg end)
|
||||
"Save the region as if killed, but don't kill it.
|
||||
"Save the region as if killed, but don’t kill it.
|
||||
In Transient Mark mode, deactivate the mark.
|
||||
If `interprogram-cut-function' is non-nil, also save the text for a window
|
||||
If ‘interprogram-cut-function’ is non-nil, also save the text for a window
|
||||
system cut and paste."
|
||||
(interactive "r")
|
||||
@end group
|
||||
|
|
@ -8591,9 +8592,9 @@ The @code{kill-new} function looks like this:
|
|||
@group
|
||||
(defun kill-new (string &optional replace yank-handler)
|
||||
"Make STRING the latest kill in the kill ring.
|
||||
Set `kill-ring-yank-pointer' to point to it.
|
||||
Set ‘kill-ring-yank-pointer’ to point to it.
|
||||
|
||||
If `interprogram-cut-function' is non-nil, apply it to STRING.
|
||||
If `interprogram-cut-function’ is non-nil, apply it to STRING.
|
||||
Optional second argument REPLACE non-nil means that STRING will replace
|
||||
the front of the kill ring, rather than being added to the list.
|
||||
@dots{}"
|
||||
|
|
@ -9266,7 +9267,7 @@ documentation string. For example:
|
|||
@smallexample
|
||||
@group
|
||||
(defvar shell-command-default-error-buffer nil
|
||||
"*Buffer name for `shell-command' @dots{} error output.
|
||||
"*Buffer name for ‘shell-command’ @dots{} error output.
|
||||
@dots{} ")
|
||||
@end group
|
||||
@end smallexample
|
||||
|
|
@ -10088,10 +10089,10 @@ With argument, rotate that many kills forward (or backward, if negative)."
|
|||
|
||||
(defun current-kill (n &optional do-not-move)
|
||||
"Rotate the yanking point by N places, and then return that kill.
|
||||
If N is zero, `interprogram-paste-function' is set, and calling it
|
||||
If N is zero, ‘interprogram-paste-function’ is set, and calling it
|
||||
returns a string, then that string is added to the front of the
|
||||
kill ring and returned as the latest kill.
|
||||
If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
|
||||
If optional arg DO-NOT-MOVE is non-nil, then don’t actually move the
|
||||
yanking point; just return the Nth kill forward."
|
||||
(let ((interprogram-paste (and (= n 0)
|
||||
interprogram-paste-function
|
||||
|
|
@ -11105,7 +11106,7 @@ up the number of pebbles in a triangle.
|
|||
@smallexample
|
||||
@group
|
||||
(defun triangle-using-dotimes (number-of-rows)
|
||||
"Using dotimes, add up the number of pebbles in a triangle."
|
||||
"Using ‘dotimes’, add up the number of pebbles in a triangle."
|
||||
(let ((total 0)) ; otherwise a total is a void variable
|
||||
(dotimes (number number-of-rows total)
|
||||
(setq total (+ total (1+ number))))))
|
||||
|
|
@ -11950,7 +11951,7 @@ duo that uses recursion."
|
|||
@group
|
||||
(defun triangle-recursive-helper (sum counter number)
|
||||
"Return SUM, using COUNTER, through NUMBER inclusive.
|
||||
This is the `helper' component of a two function duo
|
||||
This is the “helper” component of a two function duo
|
||||
that uses recursion."
|
||||
(if (> counter number)
|
||||
sum
|
||||
|
|
@ -12426,10 +12427,10 @@ Here is the code for @code{forward-sentence}:
|
|||
@smallexample
|
||||
@group
|
||||
(defun forward-sentence (&optional arg)
|
||||
"Move forward to next `sentence-end'. With argument, repeat.
|
||||
With negative argument, move backward repeatedly to `sentence-beginning'.
|
||||
"Move forward to next ‘sentence-end’. With argument, repeat.
|
||||
With negative argument, move backward repeatedly to ‘sentence-beginning’.
|
||||
|
||||
The variable `sentence-end' is a regular expression that matches ends of
|
||||
The variable ‘sentence-end’ is a regular expression that matches ends of
|
||||
sentences. Also, every paragraph boundary terminates sentences as well."
|
||||
@end group
|
||||
@group
|
||||
|
|
@ -12920,6 +12921,7 @@ The next line of the @code{forward-paragraph} function begins a
|
|||
@code{let*} expression. This is a different than @code{let}. The
|
||||
symbol is @code{let*} not @code{let}.
|
||||
|
||||
@findex let*
|
||||
The @code{let*} special form is like @code{let} except that Emacs sets
|
||||
each variable in sequence, one after another, and variables in the
|
||||
latter part of the varlist can make use of the values to which Emacs
|
||||
|
|
@ -13512,8 +13514,8 @@ For example:
|
|||
@group
|
||||
(let* ((foo 7)
|
||||
(bar (* 3 foo)))
|
||||
(message "'bar' is %d." bar))
|
||||
@result{} 'bar' is 21.
|
||||
(message "‘bar’ is %d." bar))
|
||||
@result{} ‘bar’ is 21.
|
||||
@end group
|
||||
@end smallexample
|
||||
|
||||
|
|
@ -13755,7 +13757,7 @@ All this leads to the following function definition:
|
|||
"Print number of words in the region.
|
||||
Words are defined as at least one word-constituent
|
||||
character followed by at least one character that
|
||||
is not a word-constituent. The buffer's syntax
|
||||
is not a word-constituent. The buffer’s syntax
|
||||
table determines which characters these are."
|
||||
(interactive "r")
|
||||
(message "Counting words in region ... ")
|
||||
|
|
@ -13822,7 +13824,7 @@ parenthesis and type @kbd{C-x C-e} to install it.
|
|||
(defun @value{COUNT-WORDS} (beginning end)
|
||||
"Print number of words in the region.
|
||||
Words are defined as at least one word-constituent character followed
|
||||
by at least one character that is not a word-constituent. The buffer's
|
||||
by at least one character that is not a word-constituent. The buffer’s
|
||||
syntax table determines which characters these are."
|
||||
@end group
|
||||
@group
|
||||
|
|
@ -14984,13 +14986,13 @@ beginning of the file. The function definition looks like this:
|
|||
@smallexample
|
||||
@group
|
||||
(defun lengths-list-file (filename)
|
||||
"Return list of definitions' lengths within FILE.
|
||||
"Return list of definitions’ lengths within FILE.
|
||||
The returned list is a list of numbers.
|
||||
Each number is the number of words or
|
||||
symbols in one function definition."
|
||||
@end group
|
||||
@group
|
||||
(message "Working on '%s' ... " filename)
|
||||
(message "Working on ‘%s’ ... " filename)
|
||||
(save-excursion
|
||||
(let ((buffer (find-file-noselect filename))
|
||||
(lengths-list))
|
||||
|
|
@ -15756,7 +15758,7 @@ simpler to write a list manually. Here it is:
|
|||
160 170 180 190 200
|
||||
210 220 230 240 250
|
||||
260 270 280 290 300)
|
||||
"List specifying ranges for `defuns-per-range'.")
|
||||
"List specifying ranges for ‘defuns-per-range’.")
|
||||
@end group
|
||||
@end smallexample
|
||||
|
||||
|
|
@ -17519,7 +17521,7 @@ Incidentally, @code{load-library} is an interactive interface to the
|
|||
@group
|
||||
(defun load-library (library)
|
||||
"Load the library named LIBRARY.
|
||||
This is an interface to the function `load'."
|
||||
This is an interface to the function ‘load’."
|
||||
(interactive
|
||||
(list (completing-read "Load library: "
|
||||
(apply-partially 'locate-file-completion-table
|
||||
|
|
@ -19003,12 +19005,12 @@ The @code{current-kill} function is used by @code{yank} and by
|
|||
@group
|
||||
(defun current-kill (n &optional do-not-move)
|
||||
"Rotate the yanking point by N places, and then return that kill.
|
||||
If N is zero, `interprogram-paste-function' is set, and calling it
|
||||
If N is zero, ‘interprogram-paste-function’ is set, and calling it
|
||||
returns a string, then that string is added to the front of the
|
||||
kill ring and returned as the latest kill.
|
||||
@end group
|
||||
@group
|
||||
If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
|
||||
If optional arg DO-NOT-MOVE is non-nil, then don’t actually move the
|
||||
yanking point; just return the Nth kill forward."
|
||||
(let ((interprogram-paste (and (= n 0)
|
||||
interprogram-paste-function
|
||||
|
|
@ -19347,8 +19349,8 @@ beginning (and mark at end). With argument N, reinsert the Nth most
|
|||
recently killed stretch of killed text.
|
||||
|
||||
When this command inserts killed text into the buffer, it honors
|
||||
`yank-excluded-properties' and `yank-handler' as described in the
|
||||
doc string for `insert-for-yank-1', which see.
|
||||
‘yank-excluded-properties’ and ‘yank-handler’ as described in the
|
||||
doc string for ‘insert-for-yank-1’, which see.
|
||||
|
||||
See also the command \\[yank-pop]."
|
||||
@end group
|
||||
|
|
@ -19922,7 +19924,7 @@ row, and the value of the width of the top line, which is calculated
|
|||
@group
|
||||
(defun Y-axis-element (number full-Y-label-width)
|
||||
"Construct a NUMBERed label element.
|
||||
A numbered element looks like this ' 5 - ',
|
||||
A numbered element looks like this ‘ 5 - ’,
|
||||
and is padded as needed so all line up with
|
||||
the element for the largest number."
|
||||
@end group
|
||||
|
|
@ -20023,7 +20025,7 @@ the @code{print-Y-axis} function, which inserts the list as a column.
|
|||
Height must be the maximum height of the graph.
|
||||
Full width is the width of the highest label element."
|
||||
;; Value of height and full-Y-label-width
|
||||
;; are passed by 'print-graph'.
|
||||
;; are passed by ‘print-graph’.
|
||||
@end group
|
||||
@group
|
||||
(let ((start (point)))
|
||||
|
|
@ -21148,7 +21150,7 @@ each column."
|
|||
@end group
|
||||
@group
|
||||
;; Value of symbol-width and full-Y-label-width
|
||||
;; are passed by 'print-graph'.
|
||||
;; are passed by ‘print-graph’.
|
||||
(let* ((leading-spaces
|
||||
(make-string full-Y-label-width ? ))
|
||||
;; symbol-width @r{is provided by} graph-body-print
|
||||
|
|
@ -21248,7 +21250,7 @@ Here are all the graphing definitions in their final form:
|
|||
110 120 130 140 150
|
||||
160 170 180 190 200
|
||||
210 220 230 240 250)
|
||||
"List specifying ranges for `defuns-per-range'.")
|
||||
"List specifying ranges for ‘defuns-per-range’.")
|
||||
@end group
|
||||
|
||||
@group
|
||||
|
|
@ -21309,14 +21311,14 @@ as graph-symbol.")
|
|||
@smallexample
|
||||
@group
|
||||
(defun lengths-list-file (filename)
|
||||
"Return list of definitions' lengths within FILE.
|
||||
"Return list of definitions’ lengths within FILE.
|
||||
The returned list is a list of numbers.
|
||||
Each number is the number of words or
|
||||
symbols in one function definition."
|
||||
@end group
|
||||
|
||||
@group
|
||||
(message "Working on '%s' ... " filename)
|
||||
(message "Working on ‘%s’ ... " filename)
|
||||
(save-excursion
|
||||
(let ((buffer (find-file-noselect filename))
|
||||
(lengths-list))
|
||||
|
|
@ -21446,7 +21448,7 @@ The strings are either graph-blank or graph-symbol."
|
|||
@group
|
||||
(defun Y-axis-element (number full-Y-label-width)
|
||||
"Construct a NUMBERed label element.
|
||||
A numbered element looks like this ' 5 - ',
|
||||
A numbered element looks like this ‘ 5 - ’,
|
||||
and is padded as needed so all line up with
|
||||
the element for the largest number."
|
||||
@end group
|
||||
|
|
@ -21476,7 +21478,7 @@ Optionally, print according to VERTICAL-STEP."
|
|||
@end group
|
||||
@group
|
||||
;; Value of height and full-Y-label-width
|
||||
;; are passed by 'print-graph'.
|
||||
;; are passed by ‘print-graph’.
|
||||
(let ((start (point)))
|
||||
(insert-rectangle
|
||||
(Y-axis-column height full-Y-label-width vertical-step))
|
||||
|
|
@ -21641,7 +21643,7 @@ each column."
|
|||
@end group
|
||||
@group
|
||||
;; Value of symbol-width and full-Y-label-width
|
||||
;; are passed by 'print-graph'.
|
||||
;; are passed by ‘print-graph’.
|
||||
(let* ((leading-spaces
|
||||
(make-string full-Y-label-width ? ))
|
||||
;; symbol-width @r{is provided by} graph-body-print
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ between a few different constant values:
|
|||
@example
|
||||
(pcase (get-return-code x)
|
||||
(`success (message "Done!"))
|
||||
(`would-block (message "Sorry, can't do it now"))
|
||||
(`would-block (message "Sorry, can’t do it now"))
|
||||
(`read-only (message "The shmliblick is read-only"))
|
||||
(`access-denied (message "You do not have the needed rights"))
|
||||
(code (message "Unknown return code %S" code)))
|
||||
|
|
|
|||
|
|
@ -632,13 +632,13 @@ for logging the warning. By default, it is @file{*Warnings*}.
|
|||
@end defun
|
||||
|
||||
@defun lwarn type level message &rest args
|
||||
This function reports a warning using the value of @code{(format
|
||||
This function reports a warning using the value of @code{(format-message
|
||||
@var{message} @var{args}...)} as the message in the @file{*Warnings*}
|
||||
buffer. In other respects it is equivalent to @code{display-warning}.
|
||||
@end defun
|
||||
|
||||
@defun warn message &rest args
|
||||
This function reports a warning using the value of @code{(format
|
||||
This function reports a warning using the value of @code{(format-message
|
||||
@var{message} @var{args}...)} as the message, @code{(emacs)} as the
|
||||
type, and @code{:warning} as the severity level. It exists for
|
||||
compatibility only; we recommend not using it, because you should
|
||||
|
|
|
|||
|
|
@ -1561,7 +1561,7 @@ Around advice such as:
|
|||
|
||||
@example
|
||||
(defadvice foo (around foo-around)
|
||||
"Ignore case in `foo'."
|
||||
"Ignore case in ‘foo’."
|
||||
(let ((case-fold-search t))
|
||||
ad-do-it))
|
||||
(ad-activate 'foo)
|
||||
|
|
@ -1571,7 +1571,7 @@ could translate into:
|
|||
|
||||
@example
|
||||
(defun foo--foo-around (orig-fun &rest args)
|
||||
"Ignore case in `foo'."
|
||||
"Ignore case in ‘foo’."
|
||||
(let ((case-fold-search t))
|
||||
(apply orig-fun args)))
|
||||
(advice-add 'foo :around #'foo--foo-around)
|
||||
|
|
|
|||
|
|
@ -1155,9 +1155,9 @@ Many other modes, such as `mail-mode', `outline-mode' and
|
|||
"Major mode for editing text written for humans to read.
|
||||
In this mode, paragraphs are delimited only by blank or white lines.
|
||||
You can thus get the full benefit of adaptive filling
|
||||
(see the variable `adaptive-fill-mode').
|
||||
(see the variable ‘adaptive-fill-mode’).
|
||||
\\@{text-mode-map@}
|
||||
Turning on Text mode runs the normal hook `text-mode-hook'."
|
||||
Turning on Text mode runs the normal hook ‘text-mode-hook’."
|
||||
@end group
|
||||
@group
|
||||
(set (make-local-variable 'text-mode-variant) t)
|
||||
|
|
@ -1252,7 +1252,7 @@ And here is the code to set up the keymap for Lisp mode:
|
|||
@dots{}
|
||||
map)
|
||||
"Keymap for ordinary Lisp mode.
|
||||
All commands in `lisp-mode-shared-map' are inherited by this map.")
|
||||
All commands in ‘lisp-mode-shared-map’ are inherited by this map.")
|
||||
@end group
|
||||
@end smallexample
|
||||
|
||||
|
|
@ -1268,12 +1268,12 @@ Delete converts tabs to spaces as it moves back.
|
|||
Blank lines separate paragraphs. Semicolons start comments.
|
||||
|
||||
\\@{lisp-mode-map@}
|
||||
Note that `run-lisp' may be used either to start an inferior Lisp job
|
||||
Note that ‘run-lisp’ may be used either to start an inferior Lisp job
|
||||
or to switch back to an existing one.
|
||||
@end group
|
||||
|
||||
@group
|
||||
Entry to this mode calls the value of `lisp-mode-hook'
|
||||
Entry to this mode calls the value of ‘lisp-mode-hook’
|
||||
if that value is non-nil."
|
||||
(lisp-mode-variables nil t)
|
||||
(set (make-local-variable 'find-tag-default-function)
|
||||
|
|
@ -1447,7 +1447,7 @@ will load the library that defines the mode. For example:
|
|||
(defcustom msb-mode nil
|
||||
"Toggle msb-mode.
|
||||
Setting this variable directly does not take effect;
|
||||
use either \\[customize] or the function `msb-mode'."
|
||||
use either \\[customize] or the function ‘msb-mode’."
|
||||
:set 'custom-set-minor-mode
|
||||
:initialize 'custom-initialize-default
|
||||
:version "20.4"
|
||||
|
|
@ -1605,7 +1605,7 @@ for this macro.
|
|||
Interactively with no argument, this command toggles the mode.
|
||||
A positive prefix argument enables the mode, any other prefix
|
||||
argument disables it. From Lisp, argument omitted or nil enables
|
||||
the mode, `toggle' toggles the state.
|
||||
the mode, ‘toggle’ toggles the state.
|
||||
|
||||
When Hungry mode is enabled, the control delete key
|
||||
gobbles all preceding whitespace except the last.
|
||||
|
|
|
|||
|
|
@ -1927,7 +1927,7 @@ idleness. Here's an example:
|
|||
|
||||
@example
|
||||
(defvar my-resume-timer nil
|
||||
"Timer for `my-timer-function' to reschedule itself, or nil.")
|
||||
"Timer for ‘my-timer-function’ to reschedule itself, or nil.")
|
||||
|
||||
(defun my-timer-function ()
|
||||
;; @r{If the user types a command while @code{my-resume-timer}}
|
||||
|
|
|
|||
|
|
@ -833,10 +833,9 @@ vector or string (@pxref{Iteration} for more information about the
|
|||
|
||||
@defmac seq-let arguments sequence body@dots{}
|
||||
@cindex sequence destructuring
|
||||
This macro binds the variables in defined in the sequence
|
||||
@var{arguments} to the elements of the sequence @var{sequence}.
|
||||
@var{arguments} can itself include sequences allowing for nested
|
||||
destructuring.
|
||||
This macro binds the variables defined in @var{arguments} to the
|
||||
elements of the sequence @var{sequence}. @var{arguments} can itself
|
||||
include sequences allowing for nested destructuring.
|
||||
|
||||
The @var{arguments} sequence can also include the @code{&rest} marker
|
||||
followed by a variable name to be bound to the rest of
|
||||
|
|
|
|||
|
|
@ -969,12 +969,12 @@ is not truncated.
|
|||
|
||||
@example
|
||||
@group
|
||||
(format "The word '%7s' has %d letters in it."
|
||||
(format "The word ‘%7s’ has %d letters in it."
|
||||
"foo" (length "foo"))
|
||||
@result{} "The word ' foo' has 3 letters in it."
|
||||
(format "The word '%7s' has %d letters in it."
|
||||
@result{} "The word ‘ foo’ has 3 letters in it."
|
||||
(format "The word ‘%7s’ has %d letters in it."
|
||||
"specification" (length "specification"))
|
||||
@result{} "The word 'specification' has 13 letters in it."
|
||||
@result{} "The word ‘specification’ has 13 letters in it."
|
||||
@end group
|
||||
@end example
|
||||
|
||||
|
|
@ -1013,12 +1013,12 @@ ignored.
|
|||
(format "%06d is padded on the left with zeros" 123)
|
||||
@result{} "000123 is padded on the left with zeros"
|
||||
|
||||
(format "'%-6d' is padded on the right" 123)
|
||||
@result{} "'123 ' is padded on the right"
|
||||
(format "‘%-6d’ is padded on the right" 123)
|
||||
@result{} "‘123 ’ is padded on the right"
|
||||
|
||||
(format "The word '%-7s' actually has %d letters in it."
|
||||
(format "The word ‘%-7s’ actually has %d letters in it."
|
||||
"foo" (length "foo"))
|
||||
@result{} "The word 'foo ' actually has 3 letters in it."
|
||||
@result{} "The word ‘foo ’ actually has 3 letters in it."
|
||||
@end group
|
||||
@end example
|
||||
|
||||
|
|
|
|||
|
|
@ -1960,7 +1960,7 @@ Called from a program, there are three arguments:
|
|||
@group
|
||||
REVERSE (non-nil means reverse order),\
|
||||
BEG and END (region to sort).
|
||||
The variable `sort-fold-case' determines\
|
||||
The variable ‘sort-fold-case’ determines\
|
||||
whether alphabetic case affects
|
||||
the sort order."
|
||||
@end group
|
||||
|
|
|
|||
|
|
@ -867,14 +867,14 @@ It would look like this:
|
|||
)
|
||||
|
||||
(defun MY-ROOT-FCN ()
|
||||
"Return the root fcn for `default-directory'"
|
||||
"Return the root fcn for ‘default-directory’"
|
||||
;; You might be able to use 'ede-cpp-root-project-root'
|
||||
;; and not write this at all.
|
||||
)
|
||||
|
||||
(defun MY-LOAD (dir)
|
||||
"Load a project of type `cpp-root' for the directory DIR.
|
||||
Return nil if there isn't one."
|
||||
"Load a project of type ‘cpp-root’ for the directory DIR.
|
||||
Return nil if there isn’t one."
|
||||
;; Use your preferred construction method here.
|
||||
(ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir)
|
||||
:locate-fcn 'MYFCN)
|
||||
|
|
|
|||
|
|
@ -4336,7 +4336,7 @@ best fix I've been able to come up with:
|
|||
|
||||
@lisp
|
||||
(defun rmail-reply-t ()
|
||||
"Reply only to the sender of the current message. (See rmail-reply.)"
|
||||
"Reply only to the sender of the current message. (See ‘rmail-reply’.)"
|
||||
(interactive)
|
||||
(rmail-reply t))
|
||||
|
||||
|
|
|
|||
|
|
@ -1529,7 +1529,7 @@ Currently, the default superclass is defined as follows:
|
|||
nil
|
||||
"Default parent class for classes with no specified parent class.
|
||||
Its slots are automatically adopted by classes with no specified
|
||||
parents. This class is not stored in the `parent' slot of a class vector."
|
||||
parents. This class is not stored in the ‘parent’ slot of a class vector."
|
||||
:abstract t)
|
||||
@end example
|
||||
|
||||
|
|
|
|||
|
|
@ -1671,7 +1671,7 @@ instead (works for newer versions as well):
|
|||
(setq message-user-fqdn fqdn)
|
||||
(gnus-message 1 "Redefining `message-make-fqdn'.")
|
||||
(defun message-make-fqdn ()
|
||||
"Return user's fully qualified domain name."
|
||||
"Return user’s fully qualified domain name."
|
||||
fqdn))))
|
||||
@end example
|
||||
@noindent
|
||||
|
|
@ -1765,9 +1765,9 @@ snippet by Frank Haun <pille3003@@fhaun.de> in
|
|||
|
||||
@example
|
||||
(defun my-archive-article (&optional n)
|
||||
"Copies one or more article(s) to a corresponding `nnml:' group, e.g.,
|
||||
`gnus.ding' goes to `nnml:1.gnus.ding'. And `nnml:List-gnus.ding' goes
|
||||
to `nnml:1.List-gnus-ding'.
|
||||
"Copies one or more article(s) to a corresponding ‘nnml:’ group, e.g.,
|
||||
‘gnus.ding’ goes to ‘nnml:1.gnus.ding’. And ‘nnml:List-gnus.ding’ goes
|
||||
to ‘nnml:1.List-gnus-ding’.
|
||||
|
||||
Use process marks or mark a region in the summary buffer to archive
|
||||
more then one article."
|
||||
|
|
|
|||
|
|
@ -21033,8 +21033,8 @@ function:
|
|||
|
||||
@lisp
|
||||
(defun gnus-decay-score (score)
|
||||
"Decay SCORE according to `gnus-score-decay-constant'
|
||||
and `gnus-score-decay-scale'."
|
||||
"Decay SCORE according to ‘gnus-score-decay-constant’
|
||||
and ‘gnus-score-decay-scale’."
|
||||
(let ((n (- score
|
||||
(* (if (< score 0) -1 1)
|
||||
(min (abs score)
|
||||
|
|
@ -24080,7 +24080,7 @@ spam. And here is the nifty function:
|
|||
|
||||
@lisp
|
||||
(defun my-gnus-raze-spam ()
|
||||
"Submit SPAM to Vipul's Razor, then mark it as expirable."
|
||||
"Submit SPAM to Vipul’s Razor, then mark it as expirable."
|
||||
(interactive)
|
||||
(gnus-summary-save-in-pipe "razor-report -f -d" t)
|
||||
(gnus-summary-mark-as-expirable 1))
|
||||
|
|
|
|||
|
|
@ -3159,13 +3159,13 @@ code to @file{~/.emacs}.
|
|||
@smalllisp
|
||||
@group
|
||||
(defvar my-mh-screen-saved nil
|
||||
"Set to non-@code{nil} when MH-E window configuration shown.")
|
||||
"Set to non-nil when MH-E window configuration shown.")
|
||||
(defvar my-normal-screen nil "Normal window configuration.")
|
||||
(defvar my-mh-screen nil "MH-E window configuration.")
|
||||
|
||||
(defun my-mh-rmail (&optional arg)
|
||||
"Toggle between MH-E and normal screen configurations.
|
||||
With non-@code{nil} or prefix argument, @i{inc} mailbox as well
|
||||
With non-nil or prefix argument, include mailbox as well
|
||||
when going into mail."
|
||||
(interactive "P") ; @r{user callable function, P=prefix arg}
|
||||
(setq my-mh-screen-saved ; @r{save state}
|
||||
|
|
@ -3474,7 +3474,7 @@ bindings, for example:
|
|||
@smalllisp
|
||||
@group
|
||||
(defvar my-mh-init-done nil
|
||||
"Non-@code{nil} when one-time MH-E settings made.")
|
||||
"Non-nil when one-time MH-E settings made.")
|
||||
|
||||
(defun my-mh-folder-mode-hook ()
|
||||
"Hook to set key bindings in MH-Folder mode."
|
||||
|
|
|
|||
|
|
@ -909,7 +909,7 @@ The real answer, therefore, is a @code{/reconnect} command:
|
|||
"Reconnect the server process."
|
||||
(interactive "i")
|
||||
(unless process
|
||||
(error "There's no process for this target"))
|
||||
(error "There’s no process for this target"))
|
||||
(let* ((server (car (process-contact process)))
|
||||
(port (process-contact process :service))
|
||||
(nick (rcirc-nick process))
|
||||
|
|
|
|||
|
|
@ -1046,7 +1046,7 @@ the data area, such as hidden constants you want to refer to in your
|
|||
formulas.
|
||||
|
||||
You can override the variable @code{ses--symbolic-formulas} to be a list of
|
||||
symbols (as parenthesized strings) to show as completions for the '
|
||||
symbols (as parenthesized strings) to show as completions for the @kbd{'}
|
||||
command. This initial completions list is used instead of the actual
|
||||
set of symbols-as-formulas in the spreadsheet.
|
||||
|
||||
|
|
|
|||
20
etc/NEWS
20
etc/NEWS
|
|
@ -108,7 +108,7 @@ frames.
|
|||
|
||||
** `isearch' and `query-replace' now perform character folding in matches.
|
||||
This is analogous to case-folding, but applies between Unicode
|
||||
characters and their ASCII counterparts. This means many characters
|
||||
characters and their ASCII counterparts. This means many characters
|
||||
will match entire groups of characters.
|
||||
|
||||
For instance, the " will match all variants of unicode double quotes
|
||||
|
|
@ -116,12 +116,12 @@ For instance, the " will match all variants of unicode double quotes
|
|||
cousins, even those composed of multiple characters, as well as many
|
||||
other symbols like ℀, ℁, ⒜, and ⓐ.
|
||||
|
||||
** New function `character-folded-regexp' can be used
|
||||
by searching commands to produce a a regexp matching anything that
|
||||
** New function `character-fold-to-regexp' can be used
|
||||
by searching commands to produce a regexp matching anything that
|
||||
character-folds into STRING.
|
||||
|
||||
** New command `checkdoc-package-keywords' checks if the
|
||||
current package keywords are recognized. Set the new option
|
||||
current package keywords are recognized. Set the new option
|
||||
`checkdoc-package-keywords-flag' to non-nil to make
|
||||
`checkdoc-current-buffer' call this function automatically.
|
||||
|
||||
|
|
@ -326,7 +326,7 @@ is suitable for most programming languages such as C or Lisp (but not
|
|||
|
||||
** ERC
|
||||
|
||||
*** Hide message types by network or channel. `erc-hide-list' will
|
||||
*** Hide message types by network or channel. `erc-hide-list' will
|
||||
hide all messages of the specified type, where `erc-network-hide-list'
|
||||
and `erc-channel-hide-list' will only hide the specified message types
|
||||
for the respective specified targets.
|
||||
|
|
@ -361,7 +361,7 @@ always respect that.
|
|||
|
||||
*** If a package is available on multiple archives and one has higher
|
||||
priority (as per `package-archive-priorities') only that one is
|
||||
listed. This can be configured with `package-menu-hide-low-priority'.
|
||||
listed. This can be configured with `package-menu-hide-low-priority'.
|
||||
|
||||
*** `package-menu-toggle-hiding' now toggles the hiding of packages.
|
||||
This includes the above-mentioned low-priority packages, as well as
|
||||
|
|
@ -390,7 +390,7 @@ The FORCE argument to `package-delete' overrides this.
|
|||
|
||||
*** New custom variable `package-selected-packages' tracks packages
|
||||
which were installed by the user (as opposed to installed as
|
||||
dependencies). This variable can also be manually customized.
|
||||
dependencies). This variable can also be manually customized.
|
||||
|
||||
*** New command `package-install-user-selected-packages' installs all
|
||||
packages from `package-selected-packages' which are currently missing.
|
||||
|
|
@ -543,7 +543,7 @@ appending FUN to `minibuffer-setup-hook'.
|
|||
** seq
|
||||
*** New seq library:
|
||||
The seq library adds sequence manipulation functions and macros that
|
||||
complement basic functions provided by subr.el. All functions are
|
||||
complement basic functions provided by subr.el. All functions are
|
||||
prefixed with `seq-' and work on lists, strings and vectors.
|
||||
|
||||
** map
|
||||
|
|
@ -702,11 +702,11 @@ non-integer inputs.
|
|||
interactive macro evaluation and automatic scanning of #defined symbols.
|
||||
|
||||
*** New custom variable `hide-ifdef-header-regexp' to define C/C++ header file
|
||||
name patterns. Default case-insensitive .h, .hh, .hpp and .hxx.
|
||||
name patterns. Default case-insensitive .h, .hh, .hpp, .hxx, and .h++.
|
||||
*** New custom variable `hide-ifdef-expand-reinclusion-protection' to prevent
|
||||
reinclusion protected header files from being fully hidden.
|
||||
*** New custom variable `hide-ifdef-exclude-define-regexp' to define symbol
|
||||
name patterns (e.x. all "FOR_DOXYGEN_ONLY_*") to be excluded.
|
||||
name patterns (e.g. all "FOR_DOXYGEN_ONLY_*") to be excluded.
|
||||
|
||||
** TeX mode
|
||||
|
||||
|
|
|
|||
|
|
@ -1205,7 +1205,7 @@ If non-nil, TEXT is a string that will be printed as a heading."
|
|||
(set-buffer standard-output)
|
||||
(princ "Symbol ")
|
||||
(prin1 symbol)
|
||||
(princ "'s plist is\n (")
|
||||
(princ (substitute-command-keys "'s plist is\n ("))
|
||||
(put-text-property (+ (point-min) 7) (- (point) 14)
|
||||
'face 'apropos-symbol)
|
||||
(insert (apropos-format-plist symbol "\n "))
|
||||
|
|
|
|||
|
|
@ -1988,7 +1988,7 @@ calc-kill calc-kill-region calc-yank))))
|
|||
"kbd-macros: [ (if), : (else), | (else-if), ] (end-if)"
|
||||
"kbd-macros: < > (repeat), ( ) (for), { } (loop)"
|
||||
"kbd-macros: / (break)"
|
||||
"kbd-macros: \\=` (save), ' (restore)")
|
||||
"kbd-macros: \\=` (save), \\=' (restore)")
|
||||
"user" ?Z))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
|
||||
|
||||
(defun calc-hms-notation (fmt)
|
||||
(interactive "sHours-minutes-seconds format (hms, @ ' \", etc.): ")
|
||||
(interactive "sHours-minutes-seconds format (hms, @ \\=' \", etc.): ")
|
||||
(calc-wrapper
|
||||
(if (string-match "\\`\\([^,; ]+\\)\\([,; ]*\\)\\([^,; ]\\)\\([,; ]*\\)\\([^,; ]\\)\\'" fmt)
|
||||
(progn
|
||||
|
|
@ -273,7 +273,7 @@
|
|||
(m (math-normalize (nth 2 a)))
|
||||
(s (let ((calc-internal-prec (max (- calc-internal-prec 4) 3)))
|
||||
(math-normalize (nth 3 a)))))
|
||||
(if (or
|
||||
(if (or
|
||||
(math-negp h)
|
||||
(and (= h 0) (math-negp m))
|
||||
(and (= h 0) (= m 0) (math-negp s)))
|
||||
|
|
@ -378,15 +378,15 @@
|
|||
;;; A numerical date is the number of days since midnight on
|
||||
;;; the morning of December 31, 1 B.C. (Gregorian) or January 2, 1 A.D. (Julian).
|
||||
;;; Emacs's calendar refers to such a date as an absolute date, some Calc function
|
||||
;;; names also use that terminology. If the date is a non-integer, it represents
|
||||
;;; a specific date and time.
|
||||
;;; names also use that terminology. If the date is a non-integer, it represents
|
||||
;;; a specific date and time.
|
||||
;;; A "dt" is a list of the form, (year month day), corresponding to
|
||||
;;; an integer code, or (year month day hour minute second), corresponding
|
||||
;;; to a non-integer code.
|
||||
|
||||
(defun math-date-to-gregorian-dt (date)
|
||||
"Return the day (YEAR MONTH DAY) in the Gregorian calendar.
|
||||
DATE is the number of days since December 31, -1 in the Gregorian calendar."
|
||||
DATE is the number of days since December 31, -1 in the Gregorian calendar."
|
||||
(let* ((month 1)
|
||||
day
|
||||
(year (math-quotient (math-add date (if (Math-lessp date 711859)
|
||||
|
|
@ -399,7 +399,7 @@ DATE is the number of days since December 31, -1 in the Gregorian calendar."
|
|||
(setq year (math-add year -1)))
|
||||
(if (eq year 0) (setq year -1))
|
||||
(setq date (1+ (math-sub date temp)))
|
||||
(setq temp
|
||||
(setq temp
|
||||
(if (math-leap-year-p year)
|
||||
[1 32 61 92 122 153 183 214 245 275 306 336 999]
|
||||
[1 32 60 91 121 152 182 213 244 274 305 335 999]))
|
||||
|
|
@ -410,7 +410,7 @@ DATE is the number of days since December 31, -1 in the Gregorian calendar."
|
|||
|
||||
(defun math-date-to-julian-dt (date)
|
||||
"Return the day (YEAR MONTH DAY) in the Julian calendar.
|
||||
DATE is the number of days since December 31, -1 in the Gregorian calendar."
|
||||
DATE is the number of days since December 31, -1 in the Gregorian calendar."
|
||||
(let* ((month 1)
|
||||
day
|
||||
(year (math-quotient (math-add date (if (Math-lessp date 711859)
|
||||
|
|
@ -423,7 +423,7 @@ DATE is the number of days since December 31, -1 in the Gregorian calendar."
|
|||
(setq year (math-add year -1)))
|
||||
(if (eq year 0) (setq year -1))
|
||||
(setq date (1+ (math-sub date temp)))
|
||||
(setq temp
|
||||
(setq temp
|
||||
(if (math-leap-year-p year t)
|
||||
[1 32 61 92 122 153 183 214 245 275 306 336 999]
|
||||
[1 32 60 91 121 152 182 213 244 274 305 335 999]))
|
||||
|
|
@ -444,7 +444,7 @@ in the Gregorian calendar and the remaining part determines the time."
|
|||
(date (car parts))
|
||||
(time (nth 1 parts))
|
||||
(dt (if (and calc-gregorian-switch
|
||||
(Math-lessp value
|
||||
(Math-lessp value
|
||||
(or
|
||||
(nth 3 calc-gregorian-switch)
|
||||
(apply 'math-absolute-from-gregorian-dt calc-gregorian-switch))
|
||||
|
|
@ -453,7 +453,7 @@ in the Gregorian calendar and the remaining part determines the time."
|
|||
(math-date-to-gregorian-dt date))))
|
||||
(if (math-integerp value)
|
||||
dt
|
||||
(append dt
|
||||
(append dt
|
||||
(list
|
||||
(/ time 3600)
|
||||
(% (/ time 60) 60)
|
||||
|
|
@ -467,13 +467,13 @@ in the Gregorian calendar and the remaining part determines the time."
|
|||
(year (math-add approx
|
||||
(let ((y approx)
|
||||
(sum 0))
|
||||
(while (>= (math-compare date
|
||||
(while (>= (math-compare date
|
||||
(math-absolute-from-iso-dt (setq y (math-add y 1)) 1 1)) 0)
|
||||
(setq sum (+ sum 1)))
|
||||
sum))))
|
||||
(list
|
||||
(list
|
||||
year
|
||||
(math-add (car (math-idivmod
|
||||
(math-add (car (math-idivmod
|
||||
(math-sub date (math-absolute-from-iso-dt year 1 1))
|
||||
7))
|
||||
1)
|
||||
|
|
@ -525,7 +525,7 @@ in the Gregorian calendar and the remaining part determines the time."
|
|||
(defun math-leap-year-p (year &optional julian)
|
||||
"Non-nil if YEAR is a leap year.
|
||||
If JULIAN is non-nil, then use the criterion for leap years
|
||||
in the Julian calendar, otherwise use the criterion in the
|
||||
in the Julian calendar, otherwise use the criterion in the
|
||||
Gregorian calendar."
|
||||
(if julian
|
||||
(if (math-negp year)
|
||||
|
|
@ -584,7 +584,7 @@ Recall that DATE is the number of days since December 31, -1
|
|||
in the Gregorian calendar."
|
||||
(if (eq year 0) (setq year -1))
|
||||
(let ((yearm1 (math-sub year 1)))
|
||||
(math-sub
|
||||
(math-sub
|
||||
;; Add the number of days of the year and the numbers of days
|
||||
;; in the previous years (leap year days to be added separately)
|
||||
(math-add (math-day-in-year year month day)
|
||||
|
|
@ -595,9 +595,9 @@ in the Gregorian calendar."
|
|||
(math-sub 365
|
||||
(math-quotient (math-sub 3 year)
|
||||
4)))))
|
||||
;; Subtract the number of Julian leap years which are not
|
||||
;; Gregorian leap years. In C=4N+r centuries, there will
|
||||
;; be 3N+r of these days. The following will compute
|
||||
;; Subtract the number of Julian leap years which are not
|
||||
;; Gregorian leap years. In C=4N+r centuries, there will
|
||||
;; be 3N+r of these days. The following will compute
|
||||
;; 3N+r.
|
||||
(let* ((correction (math-mul (math-quotient yearm1 100) 3))
|
||||
(res (math-idivmod correction 4)))
|
||||
|
|
@ -612,7 +612,7 @@ Recall that DATE is the number of days since December 31, -1
|
|||
in the Gregorian calendar."
|
||||
(if (eq year 0) (setq year -1))
|
||||
(let ((yearm1 (math-sub year 1)))
|
||||
(math-sub
|
||||
(math-sub
|
||||
;; Add the number of days of the year and the numbers of days
|
||||
;; in the previous years (leap year days to be added separately)
|
||||
(math-add (math-day-in-year year month day)
|
||||
|
|
@ -731,11 +731,11 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)."
|
|||
((eq x 'n)
|
||||
(math-format-number (math-floor math-fd-date)))
|
||||
((eq x 'J)
|
||||
(math-format-number
|
||||
(math-format-number
|
||||
(math-add math-fd-date math-julian-date-beginning)))
|
||||
((eq x 'j)
|
||||
(math-format-number (math-add
|
||||
(math-floor math-fd-date)
|
||||
(math-format-number (math-add
|
||||
(math-floor math-fd-date)
|
||||
math-julian-date-beginning-int)))
|
||||
((eq x 'U)
|
||||
(math-format-number (nth 1 (math-date-parts math-fd-date 719164))))
|
||||
|
|
@ -1082,7 +1082,7 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)."
|
|||
(throw 'syntax "Day value is out of range"))
|
||||
(and hour
|
||||
(progn
|
||||
(if (or (< hour 0)
|
||||
(if (or (< hour 0)
|
||||
(> hour 24)
|
||||
(and (= hour 24)
|
||||
(not (= minute 0))
|
||||
|
|
@ -1102,7 +1102,7 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)."
|
|||
(throw 'syntax "Weekday value is out of range"))
|
||||
(and hour
|
||||
(progn
|
||||
(if (or (< hour 0)
|
||||
(if (or (< hour 0)
|
||||
(> hour 24)
|
||||
(and (= hour 24)
|
||||
(not (= minute 0))
|
||||
|
|
@ -1473,7 +1473,7 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)."
|
|||
;; From cal-dst
|
||||
(defvar calendar-current-time-zone-cache)
|
||||
|
||||
(defvar math-calendar-tzinfo
|
||||
(defvar math-calendar-tzinfo
|
||||
nil
|
||||
"Information about the timezone, retrieved from the calendar.")
|
||||
|
||||
|
|
@ -1523,7 +1523,7 @@ second, the number of seconds offset for daylight savings."
|
|||
(if (calc-var-value 'var-TimeZone)
|
||||
(calcFunc-tzone (calc-var-value 'var-TimeZone) date)
|
||||
(let ((tzinfo (math-get-calendar-tzinfo)))
|
||||
(+ (nth 0 tzinfo)
|
||||
(+ (nth 0 tzinfo)
|
||||
(* (math-cal-daylight-savings-adjust date) (nth 1 tzinfo)))))))
|
||||
|
||||
(defvar math-daylight-savings-hook 'math-std-daylight-savings)
|
||||
|
|
@ -1559,8 +1559,8 @@ second, the number of seconds offset for daylight savings."
|
|||
(+ (nth 3 dt) (/ (nth 4 dt) 60.0)))
|
||||
(t
|
||||
0)))
|
||||
(rounded-abs-date
|
||||
(+
|
||||
(rounded-abs-date
|
||||
(+
|
||||
(calendar-absolute-from-gregorian
|
||||
(list (nth 1 dt) (nth 2 dt) (nth 0 dt)))
|
||||
(/ (round (* 60 time)) 60.0 24.0))))
|
||||
|
|
@ -1700,7 +1700,7 @@ and ends on the last Sunday of October at 2 a.m."
|
|||
(let* ((dt (math-date-to-dt date))
|
||||
(dim (math-days-in-month (car dt) (nth 1 dt)))
|
||||
(julian (if calc-gregorian-switch
|
||||
(math-date-to-dt (math-sub
|
||||
(math-date-to-dt (math-sub
|
||||
(or (nth 3 calc-gregorian-switch)
|
||||
(apply 'math-absolute-from-gregorian-dt calc-gregorian-switch))
|
||||
1)))))
|
||||
|
|
@ -1727,14 +1727,14 @@ and ends on the last Sunday of October at 2 a.m."
|
|||
(list 'date (math-dt-to-date (list (car dt) (nth 1 dt) (1+ day))))
|
||||
;; Otherwise do some computations
|
||||
(let ((tm (+ day (- (nth 2 calc-gregorian-switch) (nth 2 julian)))))
|
||||
(list 'date (math-dt-to-date
|
||||
(list 'date (math-dt-to-date
|
||||
(list (car dt)
|
||||
(nth 1 dt)
|
||||
;;
|
||||
;;
|
||||
(if (> tm dim) dim tm)))))))
|
||||
((and (eq (car dt) (car julian))
|
||||
(= (nth 1 dt) (nth 1 julian)))
|
||||
;; In this case, the current month is truncated because of the switch
|
||||
;; In this case, the current month is truncated because of the switch
|
||||
;; to the Gregorian calendar
|
||||
(list 'date (math-dt-to-date
|
||||
(list (car dt)
|
||||
|
|
@ -1742,7 +1742,7 @@ and ends on the last Sunday of October at 2 a.m."
|
|||
(if (>= day (nth 2 julian))
|
||||
(nth 2 julian)
|
||||
(1+ day))))))
|
||||
(t
|
||||
(t
|
||||
;; The default
|
||||
(list 'date (math-add (math-dt-to-date (list (car dt) (nth 1 dt) 1)) day))))
|
||||
(list 'date (math-add (math-dt-to-date (list (car dt) (nth 1 dt) 1)) day)))))
|
||||
|
|
@ -1779,7 +1779,7 @@ and ends on the last Sunday of October at 2 a.m."
|
|||
;; Otherwise, just make sure the date doesn't go past the end of the year
|
||||
(list 'date (math-min (math-add (math-dt-to-date (list (car dt) 1 1)) (1- day))
|
||||
(math-dt-to-date (list (car dt) 12 31))))))
|
||||
(t
|
||||
(t
|
||||
(list 'date (math-add (math-dt-to-date (list (car dt) 1 1))
|
||||
(1- day)))))
|
||||
(list 'date (math-add (math-dt-to-date (list (car dt) 1 1))
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ C-w Describe how there is no warranty for Calc."
|
|||
'("Select, Additional, Once; eVal, Formula; Rewrite"
|
||||
"More, Less, 1-9, Next, Previous"
|
||||
"Unselect, Clear; Display; Enable; Breakable"
|
||||
"' (replace), \\=` (edit), +, -, *, /, RET (grab), DEL"
|
||||
"\\=' (replace), \\=` (edit), +, -, *, /, RET (grab), DEL"
|
||||
"SHIFT + swap: Left, Right; maybe: Select, Once"
|
||||
"SHIFT + Commute, Merge, Distrib, jump-Eqn, Isolate"
|
||||
"SHIFT + Negate, & (invert); Unpack")
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
|
|||
"Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro; Keep-args"
|
||||
"Other keys: +, -, *, /, ^, \\ (int div), : (frac div)"
|
||||
"Other keys: & (1/x), | (concat), % (modulo), ! (factorial)"
|
||||
"Other keys: ' (alg-entry), = (eval), \\=` (edit); M-RET (last-args)"
|
||||
"Other keys: \\=' (alg-entry), = (eval), \\=` (edit); M-RET (last-args)"
|
||||
"Other keys: SPC/RET (enter/dup), LFD (over); < > (scroll horiz)"
|
||||
"Other keys: DEL (drop), M-DEL (drop-above); { } (scroll vert)"
|
||||
"Other keys: TAB (swap/roll-dn), M-TAB (roll-up)"
|
||||
|
|
@ -253,11 +253,12 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
|
|||
0))
|
||||
(let ((msg (nth calc-help-phase msgs)))
|
||||
(message "%s" (if msg
|
||||
(concat msg ":"
|
||||
(concat (substitute-command-keys msg) ":"
|
||||
(make-string (- (apply 'max
|
||||
(mapcar 'length
|
||||
msgs))
|
||||
(length msg)) 32)
|
||||
(length msg))
|
||||
?\ )
|
||||
" [?=MORE]")
|
||||
""))))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@
|
|||
(setq calc-display-raw (if calc-display-raw nil (if arg 0 t)))
|
||||
(calc-do-refresh)
|
||||
(if calc-display-raw
|
||||
(message "Press d ' again to cancel \"raw\" display mode"))))
|
||||
(message "%s" "Press d ' again to cancel \"raw\" display mode"))))
|
||||
|
||||
|
||||
|
||||
|
|
@ -446,11 +446,11 @@
|
|||
(calc-change-mode '(calc-algebraic-mode calc-incomplete-algebraic-mode)
|
||||
(list (not calc-algebraic-mode) nil)))
|
||||
(use-local-map calc-mode-map)
|
||||
(message (if calc-algebraic-mode
|
||||
"Numeric keys and ( and [ begin algebraic entry"
|
||||
(if calc-incomplete-algebraic-mode
|
||||
"Only ( and [ begin algebraic entry"
|
||||
"No keys except ' and $ begin algebraic entry")))))
|
||||
(message "%s" (if calc-algebraic-mode
|
||||
"Numeric keys and ( and [ begin algebraic entry"
|
||||
(if calc-incomplete-algebraic-mode
|
||||
"Only ( and [ begin algebraic entry"
|
||||
"No keys except ' and $ begin algebraic entry")))))
|
||||
|
||||
(defun calc-symbolic-mode (n)
|
||||
(interactive "P")
|
||||
|
|
|
|||
|
|
@ -1441,7 +1441,7 @@ Redefine the corresponding command."
|
|||
(let ((calc-kbd-push-level 0))
|
||||
(execute-kbd-macro (substring body 0 -2))))
|
||||
(let ((calc-kbd-push-level (1+ calc-kbd-push-level)))
|
||||
(message "Saving modes; type Z' to restore")
|
||||
(message "%s" "Saving modes; type Z' to restore")
|
||||
(recursive-edit))))))
|
||||
|
||||
(defun calc-kbd-pop ()
|
||||
|
|
@ -1450,7 +1450,7 @@ Redefine the corresponding command."
|
|||
(progn
|
||||
(message "Mode settings restored")
|
||||
(exit-recursive-edit))
|
||||
(error "Unbalanced Z' in keyboard macro")))
|
||||
(error "%s" "Unbalanced Z' in keyboard macro")))
|
||||
|
||||
|
||||
;; (defun calc-kbd-report (msg)
|
||||
|
|
|
|||
|
|
@ -736,7 +736,7 @@ If hms, angles are in degrees-minutes-seconds.")
|
|||
|
||||
(defcalcmodevar calc-algebraic-mode nil
|
||||
"If non-nil, numeric entry accepts whole algebraic expressions.
|
||||
If nil, algebraic expressions must be preceded by \"'\".")
|
||||
If nil, algebraic expressions must be preceded by \"\\='\".")
|
||||
|
||||
(defcalcmodevar calc-incomplete-algebraic-mode nil
|
||||
"Like calc-algebraic-mode except only affects ( and [ keys.")
|
||||
|
|
@ -1311,7 +1311,7 @@ This is an RPN calculator featuring arbitrary-precision integer, rational,
|
|||
floating-point, complex, matrix, and symbolic arithmetic.
|
||||
|
||||
RPN calculation: 2 RET 3 + produces 5.
|
||||
Algebraic style: ' 2+3 RET produces 5.
|
||||
Algebraic style: \\=' 2+3 RET produces 5.
|
||||
|
||||
Basic operators are +, -, *, /, ^, & (reciprocal), % (modulo), n (change-sign).
|
||||
|
||||
|
|
@ -1330,7 +1330,7 @@ Notations: 3.14e6 3.14 * 10^6
|
|||
[1 .. 4) semi-open interval, 1 <= x < 4
|
||||
2 +/- 3 (p key) number with mean 2, standard deviation 3
|
||||
2 mod 3 (M key) number 2 computed modulo 3
|
||||
<1 jan 91> Date form (enter using ' key)
|
||||
<1 jan 91> Date form (enter using \\=' key)
|
||||
|
||||
|
||||
\\{calc-mode-map}
|
||||
|
|
|
|||
|
|
@ -910,10 +910,12 @@ This is recursive; that is, included files may include other files."
|
|||
(diary-list-entries original-date number t)))))
|
||||
(display-warning
|
||||
:error
|
||||
(format "Can't read included diary file %s\n" diary-file)))
|
||||
(format-message "Can't read included diary file %s\n"
|
||||
diary-file)))
|
||||
(display-warning
|
||||
:error
|
||||
(format "Can't find included diary file %s\n" diary-file)))))
|
||||
(format-message "Can't find included diary file %s\n"
|
||||
diary-file)))))
|
||||
(goto-char (point-min)))
|
||||
|
||||
(defun diary-include-other-diary-files ()
|
||||
|
|
|
|||
|
|
@ -237,7 +237,8 @@ The final element is \"*\", indicating an unspecified month.")
|
|||
(when (string= (widget-value widget) todo-item-mark)
|
||||
(widget-put
|
||||
widget :error
|
||||
"Invalid value: must be distinct from ‘todo-item-mark’")
|
||||
(format-message
|
||||
"Invalid value: must be distinct from ‘todo-item-mark’"))
|
||||
widget)))
|
||||
:initialize 'custom-initialize-default
|
||||
:set 'todo-reset-prefix
|
||||
|
|
@ -1694,7 +1695,8 @@ only when no items are marked."
|
|||
(when (string= (widget-value widget) todo-prefix)
|
||||
(widget-put
|
||||
widget :error
|
||||
"Invalid value: must be distinct from ‘todo-prefix’")
|
||||
(format-message
|
||||
"Invalid value: must be distinct from ‘todo-prefix’"))
|
||||
widget)))
|
||||
:set (lambda (symbol value)
|
||||
(custom-set-default symbol (propertize value 'face 'todo-mark)))
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ Sets buffer local variables for EDE."
|
|||
(when projdetect
|
||||
;; No project was loaded, but we have a project description
|
||||
;; object. This means that we try to load it.
|
||||
;;
|
||||
;;
|
||||
;; Before loading, we need to check if it is a safe
|
||||
;; project to load before requesting it to be loaded.
|
||||
|
||||
|
|
@ -728,9 +728,10 @@ Return nil if DIR should not be in `ede-project-directories'."
|
|||
(when (listp ede-project-directories)
|
||||
(or (member dir ede-project-directories)
|
||||
(when (funcall ede-check-project-query-fcn
|
||||
(format "`%s' is not listed in `ede-project-directories'.
|
||||
(format-message
|
||||
"`%s' is not listed in `ede-project-directories'.
|
||||
Add it to the list of allowed project directories? "
|
||||
dir))
|
||||
dir))
|
||||
(push dir ede-project-directories)
|
||||
;; If possible, save `ede-project-directories'.
|
||||
(if (or custom-file user-init-file)
|
||||
|
|
@ -799,7 +800,7 @@ Optional argument NAME is the name to give this project."
|
|||
"Unknown file name specifier %S"
|
||||
pf)))
|
||||
:targets nil)
|
||||
|
||||
|
||||
))
|
||||
(inits (oref obj initializers)))
|
||||
;; Force the name to match for new objects.
|
||||
|
|
|
|||
|
|
@ -155,9 +155,9 @@ into memory.")
|
|||
Specifying this matcher object will allow EDE to perform a complex
|
||||
check without loading the project.
|
||||
|
||||
NOTE: If you use dirmatch, you may need to set :root-only to nil.
|
||||
NOTE: If you use dirmatch, you may need to set :root-only to `nil'.
|
||||
While it may be a root based project, all subdirs will happen to return
|
||||
true for the dirmatch, so for scanning purposes, set it to nil.")
|
||||
true for the dirmatch, so for scanning purposes, set it to `nil'.")
|
||||
(proj-root :initarg :proj-root
|
||||
:type function
|
||||
:documentation "A function symbol to call for the project root.
|
||||
|
|
@ -197,23 +197,20 @@ type is required and the load function used.")
|
|||
|
||||
(defvar ede-project-class-files
|
||||
(list
|
||||
(ede-project-autoload "edeproject-makefile"
|
||||
:name "Make" :file 'ede/proj
|
||||
(ede-project-autoload :name "Make" :file 'ede/proj
|
||||
:proj-file "Project.ede"
|
||||
:root-only nil
|
||||
:load-type 'ede-proj-load
|
||||
:class-sym 'ede-proj-project
|
||||
:safe-p nil)
|
||||
(ede-project-autoload "edeproject-automake"
|
||||
:name "Automake" :file 'ede/proj
|
||||
(ede-project-autoload :name "Automake" :file 'ede/proj
|
||||
:proj-file "Project.ede"
|
||||
:root-only nil
|
||||
:initializers '(:makefile-type Makefile.am)
|
||||
:load-type 'ede-proj-load
|
||||
:class-sym 'ede-proj-project
|
||||
:safe-p nil)
|
||||
(ede-project-autoload "automake"
|
||||
:name "automake" :file 'ede/project-am
|
||||
(ede-project-autoload :name "automake" :file 'ede/project-am
|
||||
:proj-file "Makefile.am"
|
||||
:root-only nil
|
||||
:load-type 'project-am-load
|
||||
|
|
@ -225,6 +222,19 @@ type is required and the load function used.")
|
|||
|
||||
(put 'ede-project-class-files 'risky-local-variable t)
|
||||
|
||||
(defun ede-show-supported-projects ()
|
||||
"Display all the project types registered with EDE."
|
||||
(interactive)
|
||||
(let ((b (get-buffer-create "*EDE Autodetect Projects*")))
|
||||
(set-buffer b)
|
||||
(setq buffer-read-only nil)
|
||||
(erase-buffer)
|
||||
(dolist (prj ede-project-class-files)
|
||||
(insert (oref prj name))
|
||||
(newline))
|
||||
(display-buffer b)
|
||||
))
|
||||
|
||||
(defun ede-add-project-autoload (projauto &optional flag)
|
||||
"Add PROJAUTO, an EDE autoload definition to `ede-project-class-files'.
|
||||
Optional argument FLAG indicates how this autoload should be
|
||||
|
|
@ -234,8 +244,8 @@ added. Possible values are:
|
|||
front of the list so more generic projects don't get priority."
|
||||
;; First, can we identify PROJAUTO as already in the list? If so, replace.
|
||||
(let ((projlist ede-project-class-files)
|
||||
(projname (eieio-object-name-string projauto)))
|
||||
(while (and projlist (not (string= (eieio-object-name-string (car projlist)) projname)))
|
||||
(projname (oref projauto name)))
|
||||
(while (and projlist (not (string= (oref (car projlist) name) projname)))
|
||||
(setq projlist (cdr projlist)))
|
||||
|
||||
(if projlist
|
||||
|
|
@ -296,7 +306,7 @@ be loaded.
|
|||
|
||||
NOTE: Do not call this - it should only be called from `ede-load-project-file'."
|
||||
;; Last line of defense: don't load unsafe projects.
|
||||
(when (not (or (oref this :safe-p)
|
||||
(when (not (or (oref this safe-p)
|
||||
(ede-directory-safe-p dir)))
|
||||
(error "Attempt to load an unsafe project (bug elsewhere in EDE)"))
|
||||
;; Things are good - so load the project.
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
;; The ede-generic-target-c-cpp has some example methods setting up
|
||||
;; the pre-processor map and system include path.
|
||||
;;
|
||||
;; NOTE: It is not necessary to modify ede-generic.el to add any of
|
||||
;; NOTE: It is not necessary to modify ede/generic.el to add any of
|
||||
;; the above described support features.
|
||||
|
||||
(require 'eieio-opt)
|
||||
|
|
@ -102,14 +102,14 @@ ROOTPROJ is nil, since there is only one project."
|
|||
(let* ((alobj ede-constructing))
|
||||
(when (not alobj) (error "Cannot load generic project without the autoload instance"))
|
||||
;;;
|
||||
;; TODO - find the root dir.
|
||||
;; TODO - find the root dir.
|
||||
(let ((rootdir dir))
|
||||
(funcall (oref alobj class-sym)
|
||||
(symbol-name (oref alobj class-sym))
|
||||
:name (file-name-nondirectory (directory-file-name dir))
|
||||
:version "1.0"
|
||||
:directory (file-name-as-directory rootdir)
|
||||
:file (expand-file-name (oref alobj :proj-file)
|
||||
:file (expand-file-name (oref alobj proj-file)
|
||||
rootdir)))
|
||||
))
|
||||
|
||||
|
|
@ -211,7 +211,7 @@ All directories need at least one target.")
|
|||
(let ((match nil))
|
||||
(dolist (T targets)
|
||||
(when (and (object-of-class-p T class)
|
||||
(string= (oref T :path) dir))
|
||||
(string= (oref T path) dir))
|
||||
(setq match T)
|
||||
))
|
||||
match))
|
||||
|
|
@ -241,7 +241,7 @@ If one doesn't exist, create a new one for this directory."
|
|||
(when (not ans)
|
||||
(setq ans (make-instance
|
||||
cls
|
||||
:name (oref cls shortname)
|
||||
:name (oref-default cls shortname)
|
||||
:path dir
|
||||
:source nil))
|
||||
(object-add-to-list proj :targets ans)
|
||||
|
|
@ -252,18 +252,18 @@ If one doesn't exist, create a new one for this directory."
|
|||
;;
|
||||
;; Derived projects need an autoloader so that EDE can find the
|
||||
;; different projects on disk.
|
||||
(defun ede-generic-new-autoloader (internal-name external-name
|
||||
projectfile class)
|
||||
(defun ede-generic-new-autoloader (_internal-name external-name
|
||||
projectfile class)
|
||||
"Add a new EDE Autoload instance for identifying a generic project.
|
||||
INTERNAL-NAME is a long name that identifies this project type.
|
||||
EXTERNAL-NAME is a shorter human readable name to describe the project.
|
||||
INTERNAL-NAME is obsolete and ignored.
|
||||
EXTERNAL-NAME is a human readable name to describe the project; it
|
||||
must be unique among all autoloaded projects.
|
||||
PROJECTFILE is a file name that identifies a project of this type to EDE, such as
|
||||
a Makefile, or SConstruct file.
|
||||
CLASS is the EIEIO class that is used to track this project. It should subclass
|
||||
the class `ede-generic-project' project."
|
||||
`ede-generic-project'."
|
||||
(ede-add-project-autoload
|
||||
(ede-project-autoload internal-name
|
||||
:name external-name
|
||||
(ede-project-autoload :name external-name
|
||||
:file 'ede/generic
|
||||
:proj-file projectfile
|
||||
:root-only nil
|
||||
|
|
@ -284,29 +284,29 @@ the class `ede-generic-project' project."
|
|||
(defun ede-enable-generic-projects ()
|
||||
"Enable generic project loaders."
|
||||
(interactive)
|
||||
(ede-generic-new-autoloader "generic-makefile" "Make"
|
||||
(ede-generic-new-autoloader "generic-makefile" "Generic Make"
|
||||
"Makefile" 'ede-generic-makefile-project)
|
||||
(ede-generic-new-autoloader "generic-scons" "SCons"
|
||||
(ede-generic-new-autoloader "generic-scons" "Generic SCons"
|
||||
"SConstruct" 'ede-generic-scons-project)
|
||||
(ede-generic-new-autoloader "generic-cmake" "CMake"
|
||||
(ede-generic-new-autoloader "generic-cmake" "Generic CMake"
|
||||
"CMakeLists" 'ede-generic-cmake-project)
|
||||
|
||||
;; Super Generic found via revision control tags.
|
||||
(ede-generic-new-autoloader "generic-git" "Git"
|
||||
(ede-generic-new-autoloader "generic-git" "Generic Git"
|
||||
".git" 'ede-generic-vc-project)
|
||||
(ede-generic-new-autoloader "generic-bzr" "Bazaar"
|
||||
(ede-generic-new-autoloader "generic-bzr" "Generic Bazaar"
|
||||
".bzr" 'ede-generic-vc-project)
|
||||
(ede-generic-new-autoloader "generic-hg" "Mercurial"
|
||||
(ede-generic-new-autoloader "generic-hg" "Generic Mercurial"
|
||||
".hg" 'ede-generic-vc-project)
|
||||
(ede-generic-new-autoloader "generic-svn" "Subversions"
|
||||
(ede-generic-new-autoloader "generic-svn" "Generic Subversions"
|
||||
".svn" 'ede-generic-vc-project)
|
||||
(ede-generic-new-autoloader "generic-cvs" "CVS"
|
||||
(ede-generic-new-autoloader "generic-cvs" "Generic CVS"
|
||||
"CVS" 'ede-generic-vc-project)
|
||||
|
||||
;; Take advantage of existing 'projectile' based projects.
|
||||
;; @TODO - if projectile supports compile commands etc, can we
|
||||
;; read that out? Howto if projectile is not part of core emacs.
|
||||
(ede-generic-new-autoloader "generic-projectile" ".projectile"
|
||||
(ede-generic-new-autoloader "generic-projectile" "Generic .projectile"
|
||||
".projectile" 'ede-generic-vc-project)
|
||||
|
||||
)
|
||||
|
|
|
|||
|
|
@ -637,21 +637,30 @@ SYMBOL is a function that can be overridden."
|
|||
(when (get symbol 'mode-local-overload)
|
||||
(let ((default (or (intern-soft (format "%s-default" (symbol-name symbol)))
|
||||
symbol))
|
||||
(override (and
|
||||
(boundp 'describe-function-orig-buffer) ;; added in Emacs 25
|
||||
describe-function-orig-buffer
|
||||
(with-current-buffer describe-function-orig-buffer
|
||||
(fetch-overload symbol)))))
|
||||
(override (with-current-buffer describe-function-orig-buffer
|
||||
(fetch-overload symbol)))
|
||||
modes)
|
||||
|
||||
(insert (overload-docstring-extension symbol) "\n\n")
|
||||
(insert (substitute-command-keys (format "default function: `%s'\n" default)))
|
||||
(when (and (boundp 'describe-function-orig-buffer) ;; added in Emacs 25
|
||||
describe-function-orig-buffer)
|
||||
(if override
|
||||
(insert (substitute-command-keys
|
||||
(format "\noverride in buffer '%s': `%s'\n"
|
||||
describe-function-orig-buffer override)))
|
||||
(insert (substitute-command-keys (format "\nno override in buffer '%s'\n"
|
||||
describe-function-orig-buffer)))))
|
||||
(insert (format-message "default function: `%s'\n" default))
|
||||
(if override
|
||||
(insert (format-message "\noverride in buffer '%s': `%s'\n"
|
||||
describe-function-orig-buffer override))
|
||||
(insert (format-message "\nno override in buffer '%s'\n"
|
||||
describe-function-orig-buffer)))
|
||||
|
||||
(mapatoms
|
||||
(lambda (sym) (when (get sym 'mode-local-symbol-table) (push sym modes)))
|
||||
obarray)
|
||||
|
||||
(dolist (mode modes)
|
||||
(let* ((major-mode mode)
|
||||
(override (fetch-overload symbol)))
|
||||
|
||||
(when override
|
||||
(insert (format-message "\noverride in mode ‘%s’: ’%s’\n"
|
||||
major-mode override))
|
||||
)))
|
||||
)))
|
||||
|
||||
(add-hook 'help-fns-describe-function-functions 'describe-mode-local-overload)
|
||||
|
|
|
|||
|
|
@ -405,7 +405,8 @@ or implementing a version specific to ")
|
|||
|
||||
(princ "\n\nInclude Path Summary:")
|
||||
(when edeobj
|
||||
(princ "\n\nThis file's project include search is handled by the EDE object:\n")
|
||||
(princ (substitute-command-keys
|
||||
"\n\nThis file's project include search is handled by the EDE object:\n"))
|
||||
(princ " Buffer Target: ")
|
||||
(princ (object-print edeobj))
|
||||
(princ "\n")
|
||||
|
|
@ -463,12 +464,12 @@ or implementing a version specific to ")
|
|||
|
||||
(princ "\nYou can fix the include path for ")
|
||||
(princ (symbol-name (oref table major-mode)))
|
||||
(princ " by using this function:
|
||||
(princ (substitute-command-keys " by using this function:
|
||||
|
||||
M-x semantic-customize-system-include-path RET
|
||||
\\[semantic-customize-system-include-path]
|
||||
|
||||
which customizes the mode specific variable for the mode-local
|
||||
variable `semantic-dependency-system-include-path'.")
|
||||
variable `semantic-dependency-system-include-path'."))
|
||||
)
|
||||
|
||||
(princ "\n No unknown includes.\n"))
|
||||
|
|
|
|||
|
|
@ -2176,7 +2176,8 @@ actually in their parent which is not accessible.")
|
|||
|
||||
(princ "\n\nInclude Path Summary:\n")
|
||||
(when (and (boundp 'ede-object) ede-object)
|
||||
(princ "\n This file's project include is handled by:\n")
|
||||
(princ (substitute-command-keys
|
||||
"\n This file's project include is handled by:\n"))
|
||||
(let ((objs (if (listp ede-object)
|
||||
ede-object
|
||||
(list ede-object))))
|
||||
|
|
@ -2194,14 +2195,16 @@ actually in their parent which is not accessible.")
|
|||
)
|
||||
|
||||
(when semantic-dependency-include-path
|
||||
(princ "\n This file's generic include path is:\n")
|
||||
(princ (substitute-command-keys
|
||||
"\n This file's generic include path is:\n"))
|
||||
(dolist (dir semantic-dependency-include-path)
|
||||
(princ " ")
|
||||
(princ dir)
|
||||
(princ "\n")))
|
||||
|
||||
(when semantic-dependency-system-include-path
|
||||
(princ "\n This file's system include path is:\n")
|
||||
(princ (substitute-command-keys
|
||||
"\n This file's system include path is:\n"))
|
||||
(dolist (dir semantic-dependency-system-include-path)
|
||||
(princ " ")
|
||||
(princ dir)
|
||||
|
|
|
|||
|
|
@ -503,7 +503,8 @@ Argument EVENT is the mouse clicked event."
|
|||
(princ "Include File: ")
|
||||
(princ (semantic-format-tag-name tag nil t))
|
||||
(princ "\n\n")
|
||||
(princ "This header file has been marked \"Unknown\".
|
||||
(princ (substitute-command-keys "\
|
||||
This header file has been marked \"Unknown\".
|
||||
This means that Semantic has not been able to locate this file on disk.
|
||||
|
||||
When Semantic cannot find an include file, this means that the
|
||||
|
|
@ -521,9 +522,9 @@ M-x semantic-add-system-include RET /path/to/includes RET
|
|||
|
||||
or, in your .emacs file do:
|
||||
|
||||
(semantic-add-system-include \"/path/to/include\" '")
|
||||
(semantic-add-system-include \"/path/to/include\" \\='"))
|
||||
(princ (symbol-name mm))
|
||||
(princ ")
|
||||
(princ (substitute-command-keys ")
|
||||
|
||||
to add the path to Semantic's search.
|
||||
|
||||
|
|
@ -531,7 +532,7 @@ If this is an include file that belongs to your project, then you may
|
|||
need to update `semanticdb-project-roots' or better yet, use `ede'
|
||||
to manage your project. See the ede manual for projects that will
|
||||
wrap existing project code for Semantic's benefit.
|
||||
")
|
||||
"))
|
||||
|
||||
(when (or (eq mm 'c++-mode) (eq mm 'c-mode))
|
||||
(princ "
|
||||
|
|
@ -745,7 +746,8 @@ Argument EVENT describes the event that caused this function to be called."
|
|||
(when (and (boundp 'ede-object)
|
||||
(boundp 'ede-object-project)
|
||||
ede-object)
|
||||
(princ " This file's project include search is handled by the EDE object:\n")
|
||||
(princ (substitute-command-keys
|
||||
" This file's project include search is handled by the EDE object:\n"))
|
||||
(princ " Buffer Target: ")
|
||||
(princ (object-print ede-object))
|
||||
(princ "\n")
|
||||
|
|
@ -769,7 +771,8 @@ Argument EVENT describes the event that caused this function to be called."
|
|||
(princ "\n"))
|
||||
)))
|
||||
|
||||
(princ "\n This file's system include path is:\n")
|
||||
(princ (substitute-command-keys
|
||||
"\n This file's system include path is:\n"))
|
||||
(dolist (dir semantic-dependency-system-include-path)
|
||||
(princ " ")
|
||||
(princ dir)
|
||||
|
|
|
|||
|
|
@ -364,15 +364,17 @@ origin of the code at point."
|
|||
(let ((secondclass (car (reverse (oref ctxt prefixtypes)))))
|
||||
(cond
|
||||
((and (semantic-tag-with-position-p secondclass)
|
||||
(y-or-n-p (format "Could not find `%s'. Jump to %s? "
|
||||
first (semantic-tag-name secondclass))))
|
||||
(y-or-n-p (format-message
|
||||
"Could not find `%s'. Jump to %s? "
|
||||
first (semantic-tag-name secondclass))))
|
||||
(semantic-ia--fast-jump-helper secondclass)
|
||||
)
|
||||
;; If we missed out on the class of the second item, then
|
||||
;; just visit SECOND.
|
||||
((and (semantic-tag-p second)
|
||||
(y-or-n-p (format "Could not find `%s'. Jump to %s? "
|
||||
first (semantic-tag-name second))))
|
||||
(y-or-n-p (format-message
|
||||
"Could not find `%s'. Jump to %s? "
|
||||
first (semantic-tag-name second))))
|
||||
(semantic-ia--fast-jump-helper second)
|
||||
))))
|
||||
|
||||
|
|
|
|||
|
|
@ -220,15 +220,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
|
|||
(visible-bell display boolean)
|
||||
(no-redraw-on-reenter display boolean)
|
||||
|
||||
;; doc.c
|
||||
(text-quoting-style
|
||||
help
|
||||
(choice
|
||||
(const :tag "Quote with curved single quotes \\=‘like this\\=’" curve)
|
||||
(const :tag "Quote with straight apostrophes \\='like this\\='" straight)
|
||||
(const :tag "Quote with grave accent and apostrophe \\=`like this\\='" grave)
|
||||
(const :tag "Use curved quotes if displayable, grave accent and apostrophe otherwise" nil))
|
||||
"25.1")
|
||||
;; dosfns.c
|
||||
(dos-display-scancodes display boolean)
|
||||
(dos-hyper-key keyboard integer)
|
||||
|
|
|
|||
|
|
@ -587,7 +587,7 @@ Theme files are named *-theme.el in `"))
|
|||
:follow-link 'mouse-face
|
||||
:action (lambda (_widget &rest _ignore)
|
||||
(describe-variable 'custom-theme-load-path)))
|
||||
(widget-insert "'.\n\n")
|
||||
(widget-insert (substitute-command-keys "'.\n\n"))
|
||||
|
||||
;; If the user has made customizations, display a warning and
|
||||
;; provide buttons to disable or convert them.
|
||||
|
|
|
|||
|
|
@ -3567,7 +3567,7 @@ Thus, use \\[backward-page] to find the beginning of a group of errors."
|
|||
(unless (bolp)
|
||||
(insert "\n"))
|
||||
(insert (current-time-string)
|
||||
"\tBuffer `" (buffer-name obuf) "'\n")
|
||||
(format-message "\tBuffer ‘%s’\n" (buffer-name obuf)))
|
||||
(goto-char (point-max))
|
||||
(insert "\f\n")))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -2989,7 +2989,9 @@ for symbols generated by the byte compiler itself."
|
|||
(byte-compile-warn "‘%s’ is for interactive use only%s"
|
||||
fn
|
||||
(cond ((stringp interactive-only)
|
||||
(format "; %s" interactive-only))
|
||||
(format "; %s"
|
||||
(substitute-command-keys
|
||||
interactive-only)))
|
||||
((and (symbolp 'interactive-only)
|
||||
(not (eq interactive-only t)))
|
||||
(format-message "; use ‘%s’ instead."
|
||||
|
|
|
|||
|
|
@ -1954,7 +1954,7 @@ from the comment."
|
|||
"Return non-nil if the current point is in a code fragment.
|
||||
A code fragment is identified by an open parenthesis followed by a
|
||||
symbol which is a valid function or a word in all CAPS, or a parenthesis
|
||||
that is quoted with the ' character. Only the region from START to LIMIT
|
||||
that is quoted with the \\=' character. Only the region from START to LIMIT
|
||||
is allowed while searching for the bounding parenthesis."
|
||||
(save-match-data
|
||||
(save-restriction
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ and also to avoid outputting the warning during normal execution."
|
|||
(format-message
|
||||
"‘%s’ is an obsolete %s%s%s" fun type
|
||||
(if asof (concat " (as of " asof ")") "")
|
||||
(cond ((stringp instead) (concat "; " instead))
|
||||
(cond ((stringp instead) (concat "; " (substitute-command-keys instead)))
|
||||
(instead (format-message "; use ‘%s’ instead." instead))
|
||||
(t ".")))))
|
||||
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ See also `warning-series', `warning-prefix-function' and
|
|||
;; Any keymap that is defined will do.
|
||||
;;;###autoload
|
||||
(defun lwarn (type level message &rest args)
|
||||
"Display a warning message made from (format MESSAGE ARGS...).
|
||||
"Display a warning message made from (format-message MESSAGE ARGS...).
|
||||
\\<special-mode-map>
|
||||
Aside from generating the message with `format-message',
|
||||
this is equivalent to `display-warning'.
|
||||
|
|
@ -336,7 +336,7 @@ LEVEL should be either :debug, :warning, :error, or :emergency
|
|||
|
||||
;;;###autoload
|
||||
(defun warn (message &rest args)
|
||||
"Display a warning message made from (format MESSAGE ARGS...).
|
||||
"Display a warning message made from (format-message MESSAGE ARGS...).
|
||||
Aside from generating the message with `format-message',
|
||||
this is equivalent to `display-warning', using
|
||||
`emacs' as the type and `:warning' as the level."
|
||||
|
|
|
|||
|
|
@ -1984,7 +1984,8 @@ created."
|
|||
(if (edt-y-or-n-p "Do you want to run it now? ")
|
||||
(load-file path)
|
||||
(error "EDT Emulation not configured")))
|
||||
(insert "Nope, I can't seem to find it. :-(\n\n")
|
||||
(insert (substitute-command-keys
|
||||
"Nope, I can't seem to find it. :-(\n\n"))
|
||||
(sit-for 20)
|
||||
(error "EDT Emulation not configured"))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -1751,8 +1751,8 @@ invokes the command before that, etc."
|
|||
|
||||
(setq this-command 'viper-display-current-destructive-command)
|
||||
|
||||
(message " `.' runs %s%s"
|
||||
(concat "`" (viper-array-to-string keys) "'")
|
||||
(message " `.' runs `%s'%s"
|
||||
(viper-array-to-string keys)
|
||||
(viper-abbreviate-string
|
||||
(if (featurep 'xemacs)
|
||||
(replace-in-string ; xemacs
|
||||
|
|
@ -1763,7 +1763,8 @@ invokes the command before that, etc."
|
|||
text ; emacs
|
||||
)
|
||||
max-text-len
|
||||
" inserting `" "'" " ......."))
|
||||
(format-message " inserting `") (format-message "'")
|
||||
" ......."))
|
||||
))
|
||||
|
||||
|
||||
|
|
@ -4341,7 +4342,7 @@ and regexp replace."
|
|||
(query-replace-regexp
|
||||
str
|
||||
(viper-read-string-with-history
|
||||
(format "Query replace regexp `%s' with: " str)
|
||||
(format-message "Query replace regexp `%s' with: " str)
|
||||
nil ; no initial
|
||||
'viper-replace1-history
|
||||
(car viper-replace1-history) ; default
|
||||
|
|
@ -4349,7 +4350,7 @@ and regexp replace."
|
|||
(query-replace
|
||||
str
|
||||
(viper-read-string-with-history
|
||||
(format "Query replace `%s' with: " str)
|
||||
(format-message "Query replace `%s' with: " str)
|
||||
nil ; no initial
|
||||
'viper-replace1-history
|
||||
(car viper-replace1-history) ; default
|
||||
|
|
@ -4643,7 +4644,7 @@ One can use \\=`\\=` and \\='\\=' to temporarily jump 1 step back."
|
|||
reg (buffer-name buf) line-no))
|
||||
(princ (format "Here is some text around %c:\n\n %s"
|
||||
reg text)))
|
||||
(princ (format viper-EmptyTextmarker reg))))
|
||||
(princ (format-message viper-EmptyTextmarker reg))))
|
||||
))
|
||||
(t (error viper-InvalidTextmarker reg)))))
|
||||
|
||||
|
|
|
|||
|
|
@ -491,7 +491,7 @@ reversed."
|
|||
(forward-char 1)
|
||||
(cond ((looking-at "'") (setq ex-token nil))
|
||||
((looking-at "[a-z]") (setq ex-token (following-char)))
|
||||
(t (error "Marks are ' and a-z")))
|
||||
(t (error "%s" "Marks are ' and a-z")))
|
||||
(forward-char 1))
|
||||
((looking-at "\n")
|
||||
(setq ex-token-type 'end-mark)
|
||||
|
|
@ -2190,7 +2190,7 @@ Please contact your system administrator. "
|
|||
(defun ex-compile ()
|
||||
"Reads args from the command line, then runs make with the args.
|
||||
If no args are given, then it runs the last compile command.
|
||||
Type 'mak ' (including the space) to run make with no args."
|
||||
Type `mak ' (including the space) to run make with no args."
|
||||
(let (args)
|
||||
(with-current-buffer (setq viper-ex-work-buf
|
||||
(get-buffer-create viper-ex-work-buf-name))
|
||||
|
|
|
|||
|
|
@ -529,9 +529,9 @@ mistakes in macro names to be passed to this function is to use
|
|||
(cond ((and (cdr buf-mapping)
|
||||
(or (and (not (cdr mode-mapping)) (not (cdr global-mapping)))
|
||||
(y-or-n-p
|
||||
(format "Unmap %S for `%s' only? "
|
||||
(viper-display-macro macro-name)
|
||||
(buffer-name)))))
|
||||
(format-message "Unmap %S for `%s' only? "
|
||||
(viper-display-macro macro-name)
|
||||
(buffer-name)))))
|
||||
(setq macro-pair buf-mapping)
|
||||
(message "%S is unmapped for %s in `%s'"
|
||||
(viper-display-macro macro-name)
|
||||
|
|
@ -539,9 +539,9 @@ mistakes in macro names to be passed to this function is to use
|
|||
((and (cdr mode-mapping)
|
||||
(or (not (cdr global-mapping))
|
||||
(y-or-n-p
|
||||
(format "Unmap %S for the major mode `%S' only? "
|
||||
(viper-display-macro macro-name)
|
||||
major-mode))))
|
||||
(format-message "Unmap %S for the major mode `%S' only? "
|
||||
(viper-display-macro macro-name)
|
||||
major-mode))))
|
||||
(setq macro-pair mode-mapping)
|
||||
(message "%S is unmapped for %s in %S"
|
||||
(viper-display-macro macro-name) state-name major-mode))
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ active server buffer available."
|
|||
;; existing process.
|
||||
(when (or notest (erc-autoaway-some-open-server-buffer))
|
||||
(setq erc-autoaway-caused-away t)
|
||||
(erc-cmd-GAWAY (format erc-autoaway-message idle-time))))
|
||||
(erc-cmd-GAWAY (format-message erc-autoaway-message idle-time))))
|
||||
|
||||
(defun erc-autoaway-reset-indicators (&rest stuff)
|
||||
"Reset indicators used by the erc-autoaway module."
|
||||
|
|
|
|||
|
|
@ -1136,7 +1136,8 @@ Would expand to:
|
|||
aliases))
|
||||
(let* ((hook-name (intern (format "erc-server-%s-functions" name)))
|
||||
(fn-name (intern (format "erc-server-%s" name)))
|
||||
(hook-doc (format "%sHook called upon receiving a %%s server response.
|
||||
(hook-doc (format-message "\
|
||||
%sHook called upon receiving a %%s server response.
|
||||
Each function is called with two arguments, the process associated
|
||||
with the response and the parsed response. If the function returns
|
||||
non-nil, stop processing the hook. Otherwise, continue.
|
||||
|
|
@ -1146,7 +1147,8 @@ See also `%s'."
|
|||
(concat extra-var-doc "\n\n")
|
||||
"")
|
||||
fn-name))
|
||||
(fn-doc (format "%sHandler for a %s server response.
|
||||
(fn-doc (format-message "\
|
||||
%sHandler for a %s server response.
|
||||
PROC is the server process which returned the response.
|
||||
PARSED is the actual response as an `erc-response' struct.
|
||||
If you want to add responses don't modify this function, but rather
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ function is called."
|
|||
|
||||
(defcustom erc-fill-static-center 27
|
||||
"Column around which all statically filled messages will be
|
||||
centered. This column denotes the point where the ' ' character
|
||||
centered. This column denotes the point where the ` ' character
|
||||
between <nickname> and the entered text will be put, thus aligning
|
||||
nick names right and text left."
|
||||
:group 'erc-fill
|
||||
|
|
@ -195,4 +195,3 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'."
|
|||
;; Local Variables:
|
||||
;; indent-tabs-mode: nil
|
||||
;; End:
|
||||
|
||||
|
|
|
|||
|
|
@ -243,8 +243,9 @@ Thus, this does not include the current directory.")
|
|||
eshell-ask-to-save-last-dir
|
||||
(or (eq eshell-ask-to-save-last-dir 'always)
|
||||
(y-or-n-p
|
||||
(format "Save last dir ring for Eshell buffer `%s'? "
|
||||
(buffer-name buf)))))
|
||||
(format-message
|
||||
"Save last dir ring for Eshell buffer `%s'? "
|
||||
(buffer-name buf)))))
|
||||
(eshell-write-last-dir-ring))))))
|
||||
|
||||
(defun eshell-lone-directory-p (file)
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@ the form:
|
|||
glob (car globs)
|
||||
len (length glob)))))
|
||||
(if (and recurse-p (not glob))
|
||||
(error "'**' cannot end a globbing pattern"))
|
||||
(error "‘**’ cannot end a globbing pattern"))
|
||||
(let ((index 1))
|
||||
(setq incl glob)
|
||||
(while (and (eq incl glob)
|
||||
|
|
|
|||
|
|
@ -306,8 +306,9 @@ element, regardless of any text on the command line. In that case,
|
|||
eshell-save-history-on-exit
|
||||
(or (eq eshell-save-history-on-exit t)
|
||||
(y-or-n-p
|
||||
(format "Save input history for Eshell buffer `%s'? "
|
||||
(buffer-name buf)))))
|
||||
(format-message
|
||||
"Save input history for Eshell buffer `%s'? "
|
||||
(buffer-name buf)))))
|
||||
(eshell-write-history))))))
|
||||
|
||||
(defun eshell/history (&rest args)
|
||||
|
|
|
|||
|
|
@ -206,23 +206,23 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
|
|||
(not (file-symlink-p (car files))))
|
||||
(progn
|
||||
(if em-verbose
|
||||
(eshell-printn (format "rm: removing directory `%s'"
|
||||
(car files))))
|
||||
(eshell-printn (format-message "rm: removing directory `%s'"
|
||||
(car files))))
|
||||
(unless
|
||||
(or em-preview
|
||||
(and em-interactive
|
||||
(not (y-or-n-p
|
||||
(format "rm: remove directory `%s'? "
|
||||
(car files))))))
|
||||
(format-message "rm: remove directory `%s'? "
|
||||
(car files))))))
|
||||
(eshell-funcalln 'delete-directory (car files) t t)))
|
||||
(if em-verbose
|
||||
(eshell-printn (format "rm: removing file `%s'"
|
||||
(car files))))
|
||||
(eshell-printn (format-message "rm: removing file `%s'"
|
||||
(car files))))
|
||||
(unless (or em-preview
|
||||
(and em-interactive
|
||||
(not (y-or-n-p
|
||||
(format "rm: remove `%s'? "
|
||||
(car files))))))
|
||||
(format-message "rm: remove `%s'? "
|
||||
(car files))))))
|
||||
(eshell-funcalln 'delete-file (car files) t))))
|
||||
(setq files (cdr files))))
|
||||
|
||||
|
|
@ -260,28 +260,32 @@ Remove (unlink) the FILE(s).")
|
|||
(cond
|
||||
((bufferp entry)
|
||||
(if em-verbose
|
||||
(eshell-printn (format "rm: removing buffer `%s'" entry)))
|
||||
(eshell-printn (format-message "rm: removing buffer `%s'" entry)))
|
||||
(unless (or em-preview
|
||||
(and em-interactive
|
||||
(not (y-or-n-p (format "rm: delete buffer `%s'? "
|
||||
entry)))))
|
||||
(not (y-or-n-p (format-message
|
||||
"rm: delete buffer `%s'? "
|
||||
entry)))))
|
||||
(eshell-funcalln 'kill-buffer entry)))
|
||||
((eshell-processp entry)
|
||||
(if em-verbose
|
||||
(eshell-printn (format "rm: killing process `%s'" entry)))
|
||||
(eshell-printn (format-message "rm: killing process `%s'" entry)))
|
||||
(unless (or em-preview
|
||||
(and em-interactive
|
||||
(not (y-or-n-p (format "rm: kill process `%s'? "
|
||||
entry)))))
|
||||
(not (y-or-n-p (format-message
|
||||
"rm: kill process `%s'? "
|
||||
entry)))))
|
||||
(eshell-funcalln 'kill-process entry)))
|
||||
((symbolp entry)
|
||||
(if em-verbose
|
||||
(eshell-printn (format "rm: uninterning symbol `%s'" entry)))
|
||||
(eshell-printn (format-message
|
||||
"rm: uninterning symbol `%s'" entry)))
|
||||
(unless
|
||||
(or em-preview
|
||||
(and em-interactive
|
||||
(not (y-or-n-p (format "rm: unintern symbol `%s'? "
|
||||
entry)))))
|
||||
(not (y-or-n-p (format-message
|
||||
"rm: unintern symbol `%s'? "
|
||||
entry)))))
|
||||
(eshell-funcalln 'unintern entry)))
|
||||
((stringp entry)
|
||||
;; -f should silently ignore missing files (bug#15373).
|
||||
|
|
@ -294,8 +298,8 @@ Remove (unlink) the FILE(s).")
|
|||
(if (or em-preview
|
||||
(not em-interactive)
|
||||
(y-or-n-p
|
||||
(format "rm: descend into directory `%s'? "
|
||||
entry)))
|
||||
(format-message "rm: descend into directory `%s'? "
|
||||
entry)))
|
||||
(eshell-remove-entries (list entry) t))
|
||||
(eshell-error (format "rm: %s: is a directory\n" entry)))
|
||||
(eshell-remove-entries (list entry) t))))))
|
||||
|
|
@ -369,8 +373,8 @@ Remove the DIRECTORY(ies), if they are empty.")
|
|||
(equal (nth 10 attr-target) (nth 10 attr))
|
||||
(nth 11 attr-target) (nth 11 attr)
|
||||
(equal (nth 11 attr-target) (nth 11 attr)))
|
||||
(eshell-error (format "%s: `%s' and `%s' are the same file\n"
|
||||
command (car files) target)))
|
||||
(eshell-error (format-message "%s: `%s' and `%s' are the same file\n"
|
||||
command (car files) target)))
|
||||
(t
|
||||
(let ((source (car files))
|
||||
(target (if is-dir
|
||||
|
|
|
|||
|
|
@ -1016,8 +1016,8 @@ be finished later after the completion of an asynchronous subprocess."
|
|||
;; we can modify any `let' forms to evaluate only once.
|
||||
(if (macrop (car form))
|
||||
(let ((exp (eshell-copy-tree (macroexpand form))))
|
||||
(eshell-manipulate (format "expanding macro `%s'"
|
||||
(symbol-name (car form)))
|
||||
(eshell-manipulate (format-message "expanding macro `%s'"
|
||||
(symbol-name (car form)))
|
||||
(setcar form (car exp))
|
||||
(setcdr form (cdr exp)))))
|
||||
(let ((args (cdr form)))
|
||||
|
|
@ -1095,8 +1095,8 @@ be finished later after the completion of an asynchronous subprocess."
|
|||
(t
|
||||
(if (and args (not (memq (car form) '(run-hooks))))
|
||||
(eshell-manipulate
|
||||
(format "evaluating arguments to `%s'"
|
||||
(symbol-name (car form)))
|
||||
(format-message "evaluating arguments to `%s'"
|
||||
(symbol-name (car form)))
|
||||
(while args
|
||||
(setcar args (eshell-do-eval (car args) synchronous-p))
|
||||
(setq args (cdr args)))))
|
||||
|
|
|
|||
|
|
@ -409,7 +409,8 @@ If QUERY is non-nil, query the user with QUERY before calling FUNC."
|
|||
(or all
|
||||
(not (nth 2 entry)))
|
||||
(or (not query)
|
||||
(y-or-n-p (format query (process-name (car entry))))))
|
||||
(y-or-n-p (format-message query
|
||||
(process-name (car entry))))))
|
||||
(setq result (funcall func (car entry))))
|
||||
(unless (memq (process-status (car entry))
|
||||
'(run stop open closed))
|
||||
|
|
@ -480,11 +481,11 @@ See the variable `eshell-kill-processes-on-exit'."
|
|||
(save-window-excursion
|
||||
(list-processes)
|
||||
(if (or (not (eq eshell-kill-processes-on-exit 'ask))
|
||||
(y-or-n-p (format "Kill processes owned by `%s'? "
|
||||
(buffer-name))))
|
||||
(y-or-n-p (format-message "Kill processes owned by `%s'? "
|
||||
(buffer-name))))
|
||||
(eshell-round-robin-kill
|
||||
(if (eq eshell-kill-processes-on-exit 'every)
|
||||
"Kill Eshell child process `%s'? ")))
|
||||
(format-message "Kill Eshell child process `%s'? "))))
|
||||
(let ((buf (get-buffer "*Process List*")))
|
||||
(if (and buf (buffer-live-p buf))
|
||||
(kill-buffer buf)))
|
||||
|
|
|
|||
|
|
@ -868,8 +868,9 @@ be a select method."
|
|||
(not (eq gnus-agent-synchronize-flags 'ask)))
|
||||
(and (eq gnus-agent-synchronize-flags 'ask)
|
||||
(gnus-y-or-n-p
|
||||
(format "Synchronize flags on server `%s'? "
|
||||
(cadr method))))))
|
||||
(gnus-format-message
|
||||
"Synchronize flags on server `%s'? "
|
||||
(cadr method))))))
|
||||
(gnus-agent-synchronize-flags-server method)))
|
||||
|
||||
;;;###autoload
|
||||
|
|
|
|||
|
|
@ -2428,7 +2428,7 @@ long lines if and only if arg is positive."
|
|||
(unless (setq from (gnus-article-goto-header "from"))
|
||||
(insert "From:")
|
||||
(setq from (point))
|
||||
(insert " [no `from' set]\n"))
|
||||
(insert " [no 'from' set]\n"))
|
||||
(while faces
|
||||
(when (setq png (gnus-convert-face-to-png (pop faces)))
|
||||
(setq image
|
||||
|
|
@ -2770,7 +2770,7 @@ summary buffer."
|
|||
(cond ((file-directory-p file)
|
||||
(when (or (not (eq how 'file))
|
||||
(gnus-y-or-n-p
|
||||
(format
|
||||
(gnus-format-message
|
||||
"Delete temporary HTML file(s) in directory `%s'? "
|
||||
(file-name-as-directory file))))
|
||||
(gnus-delete-directory file)))
|
||||
|
|
|
|||
|
|
@ -96,7 +96,8 @@ The optional LAYOUT overrides the `edit-form' window layout."
|
|||
(while (not (eobp))
|
||||
(insert ";;; ")
|
||||
(forward-line 1))
|
||||
(insert ";; Type `C-c C-c' after you've finished editing.\n")
|
||||
(insert (substitute-command-keys
|
||||
";; Type `C-c C-c' after you've finished editing.\n"))
|
||||
(insert "\n")
|
||||
(let ((p (point)))
|
||||
(gnus-pp form)
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ colors of the displayed X-Faces."
|
|||
(article-narrow-to-head)
|
||||
(gnus-article-goto-header "from")
|
||||
(when (bobp)
|
||||
(insert "From: [no `from' set]\n")
|
||||
(insert "From: [no 'from' set]\n")
|
||||
(forward-char -17))
|
||||
(gnus-add-image
|
||||
'xface
|
||||
|
|
|
|||
|
|
@ -2950,7 +2950,7 @@ and NEW-NAME will be prompted for."
|
|||
(gnus-info-params info))
|
||||
(t info))
|
||||
;; The proper documentation.
|
||||
(format
|
||||
(gnus-format-message
|
||||
"Editing the %s for `%s'."
|
||||
(cond
|
||||
((eq part 'method) "select method")
|
||||
|
|
@ -3278,7 +3278,8 @@ mail messages or news articles in files that have numeric names."
|
|||
(error "%s is not an nnimap group" group))
|
||||
(unless (setq acl (nnimap-acl-get mailbox (cadr method)))
|
||||
(error "Server does not support ACL's"))
|
||||
(gnus-edit-form acl (format "Editing the access control list for `%s'.
|
||||
(gnus-edit-form acl (gnus-format-message "\
|
||||
Editing the access control list for `%s'.
|
||||
|
||||
An access control list is a list of (identifier . rights) elements.
|
||||
|
||||
|
|
|
|||
|
|
@ -9489,6 +9489,7 @@ Optional argument BACKWARD means do search for backward.
|
|||
;; Return whether we found the regexp.
|
||||
(when (eq found 'found)
|
||||
(goto-char point)
|
||||
(sit-for 0) ;; Ensure that the point is visible in the summary window.
|
||||
(gnus-summary-show-thread)
|
||||
(gnus-summary-goto-subject gnus-current-article)
|
||||
(gnus-summary-position-point)
|
||||
|
|
|
|||
|
|
@ -1616,8 +1616,8 @@ If performed on a topic, edit the topic parameters instead."
|
|||
(let ((topic (gnus-group-topic-name)))
|
||||
(gnus-edit-form
|
||||
(gnus-topic-parameters topic)
|
||||
(format "Editing the topic parameters for `%s'."
|
||||
(or group topic))
|
||||
(gnus-format-message "Editing the topic parameters for `%s'."
|
||||
(or group topic))
|
||||
`(lambda (form)
|
||||
(gnus-topic-set-parameters ,topic form)))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -612,7 +612,7 @@ If CONFIRM is non-nil, ask for confirmation before removing a file."
|
|||
(when (and (> (- currday fileday) diff)
|
||||
(if confirm
|
||||
(y-or-n-p
|
||||
(format "\
|
||||
(gnus-format-message "\
|
||||
Delete old (> %s day(s)) incoming mail file `%s'? " diff bfile))
|
||||
(gnus-message 8 "\
|
||||
Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
|
||||
|
|
|
|||
|
|
@ -2235,7 +2235,7 @@ contains a valid encoded word. Decode again? "
|
|||
(unless cs-coding
|
||||
(setq cs-coding
|
||||
(mm-read-coding-system
|
||||
(format "\
|
||||
(gnus-format-message "\
|
||||
Decoded Subject \"%s\"
|
||||
contains an encoded word. The charset `%s' is unknown or invalid.
|
||||
Hit RET to replace non-decodable characters with \"%s\" or enter replacement
|
||||
|
|
@ -4510,7 +4510,7 @@ This function could be useful in `message-setup-hook'."
|
|||
(dolist (bog (message-bogus-recipient-p addr))
|
||||
(and bog
|
||||
(not (y-or-n-p
|
||||
(format
|
||||
(gnus-format-message
|
||||
"Address `%s'%s might be bogus. Continue? "
|
||||
bog
|
||||
;; If the encoded version of the email address
|
||||
|
|
@ -8484,7 +8484,7 @@ Header and body are separated by `mail-header-separator'."
|
|||
(when force
|
||||
(sit-for message-send-form-letter-delay))
|
||||
(if (or force
|
||||
(y-or-n-p (format "Send message to `%s'? " to)))
|
||||
(y-or-n-p (gnus-format-message "Send message to `%s'? " to)))
|
||||
(progn
|
||||
(setq sent (1+ sent))
|
||||
(message-send-and-exit))
|
||||
|
|
|
|||
|
|
@ -855,7 +855,7 @@ external if displayed external."
|
|||
(concat
|
||||
"using external program \""
|
||||
(format method filename) "\"")
|
||||
(format
|
||||
(gnus-format-message
|
||||
"by calling `%s' on the contents)" method))
|
||||
"? "))))))
|
||||
(if external
|
||||
|
|
|
|||
|
|
@ -523,7 +523,8 @@ apply the face `mm-uu-extract'."
|
|||
(when (and mml2015-use (null (mml2015-clear-verify-function)))
|
||||
(mm-set-handle-multipart-parameter
|
||||
mm-security-handle 'gnus-details
|
||||
(format "Clear verification not supported by `%s'.\n" mml2015-use)))
|
||||
(gnus-format-message
|
||||
"Clear verification not supported by `%s'.\n" mml2015-use)))
|
||||
(mml2015-extract-cleartext-signature))
|
||||
(list (mm-make-handle buf mm-uu-text-plain-type)))))
|
||||
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ Whether the passphrase is cached at all is controlled by
|
|||
"")))))
|
||||
(if (setq cert (smime-cert-by-dns who))
|
||||
(setq result (list 'certfile (buffer-name cert)))
|
||||
(setq bad (format "`%s' not found. " who))))
|
||||
(setq bad (gnus-format-message "`%s' not found. " who))))
|
||||
(quit))
|
||||
result))
|
||||
|
||||
|
|
@ -221,7 +221,7 @@ Whether the passphrase is cached at all is controlled by
|
|||
"")))))
|
||||
(if (setq cert (smime-cert-by-ldap who))
|
||||
(setq result (list 'certfile (buffer-name cert)))
|
||||
(setq bad (format "`%s' not found. " who))))
|
||||
(setq bad (gnus-format-message "`%s' not found. " who))))
|
||||
(quit))
|
||||
result))
|
||||
|
||||
|
|
|
|||
|
|
@ -209,10 +209,10 @@ must never cause a Lisp error."
|
|||
(defun rfc2231-decode-encoded-string (string)
|
||||
"Decode an RFC2231-encoded string.
|
||||
These look like:
|
||||
\"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
||||
\"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
||||
\"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
||||
\"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
|
||||
\"us-ascii\\='en-us\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
||||
\"us-ascii\\='\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
||||
\"\\='en-us\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\",
|
||||
\"\\='\\='This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
|
||||
\"This is ***fun***\"."
|
||||
(string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
|
||||
(let ((coding-system (mm-charset-to-coding-system
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ symbol `ask', query before flushing the queue file."
|
|||
(if (or (eq keep nil)
|
||||
(and (eq keep 'ask)
|
||||
(y-or-n-p
|
||||
(format
|
||||
(gnus-format-message
|
||||
"Flush requests from `%s'? " (current-buffer)))))
|
||||
(progn
|
||||
(gnus-message 7 "Flushing request file `%s'"
|
||||
|
|
|
|||
|
|
@ -746,7 +746,7 @@ it is displayed along with the global value."
|
|||
(princ "Its ")))
|
||||
(if valvoid
|
||||
(princ " is void as a variable.")
|
||||
(princ "'s "))))
|
||||
(princ (substitute-command-keys "’s ")))))
|
||||
(unless valvoid
|
||||
(with-current-buffer standard-output
|
||||
(setq val-start-pos (point))
|
||||
|
|
@ -859,11 +859,14 @@ it is displayed along with the global value."
|
|||
((not permanent-local))
|
||||
((bufferp locus)
|
||||
(setq extra-line t)
|
||||
(princ " This variable's buffer-local value is permanent.\n"))
|
||||
(princ
|
||||
(substitute-command-keys
|
||||
" This variable's buffer-local value is permanent.\n")))
|
||||
(t
|
||||
(setq extra-line t)
|
||||
(princ " This variable's value is permanent \
|
||||
if it is given a local binding.\n")))
|
||||
(princ (substitute-command-keys
|
||||
" This variable's value is permanent \
|
||||
if it is given a local binding.\n"))))
|
||||
|
||||
;; Mention if it's an alias.
|
||||
(unless (eq alias variable)
|
||||
|
|
@ -896,7 +899,8 @@ if it is given a local binding.\n")))
|
|||
(dir-locals-find-file
|
||||
(buffer-file-name buffer))))
|
||||
(dir-file t))
|
||||
(princ " This variable's value is directory-local")
|
||||
(princ (substitute-command-keys
|
||||
" This variable's value is directory-local"))
|
||||
(if (null file)
|
||||
(princ ".\n")
|
||||
(princ ", set ")
|
||||
|
|
@ -918,7 +922,8 @@ if it is given a local binding.\n")))
|
|||
file 'type 'help-dir-local-var-def
|
||||
'help-args (list variable file)))
|
||||
(princ (substitute-command-keys "’.\n"))))
|
||||
(princ " This variable's value is file-local.\n")))
|
||||
(princ (substitute-command-keys
|
||||
" This variable's value is file-local.\n"))))
|
||||
|
||||
(when (memq variable ignored-local-variables)
|
||||
(setq extra-line t)
|
||||
|
|
|
|||
|
|
@ -935,7 +935,7 @@ and their encoded form is inserted byte by byte."
|
|||
(mapconcat (function (lambda (c) (format "%x" c)))
|
||||
internal " "))
|
||||
(if (yes-or-no-p
|
||||
(format
|
||||
(format-message
|
||||
"Insert char 0x%x's internal representation \"%s\"? "
|
||||
ch internal-hex))
|
||||
(setq encoded internal)
|
||||
|
|
|
|||
|
|
@ -348,6 +348,12 @@ Don't move point."
|
|||
;;; Lisp
|
||||
;;;
|
||||
|
||||
(define-error 'imenu-unavailable "imenu unavailable")
|
||||
|
||||
(defun imenu-unavailable-error (format &rest args)
|
||||
(signal 'imenu-unavailable
|
||||
(list (apply #'format-message format args))))
|
||||
|
||||
(defun imenu-example--lisp-extract-index-name ()
|
||||
;; Example of a candidate for `imenu-extract-index-name-function'.
|
||||
;; This will generate a flat index of definitions in a lisp file.
|
||||
|
|
@ -590,7 +596,8 @@ See `imenu--index-alist' for the format of the index alist."
|
|||
(funcall imenu-create-index-function))))
|
||||
(imenu--truncate-items imenu--index-alist)))
|
||||
(or imenu--index-alist noerror
|
||||
(user-error "No items suitable for an index found in this buffer"))
|
||||
(imenu-unavailable-error
|
||||
"No items suitable for an index found in this buffer"))
|
||||
(or imenu--index-alist
|
||||
(setq imenu--index-alist (list nil)))
|
||||
;; Add a rescan option to the index.
|
||||
|
|
@ -704,7 +711,7 @@ The alternate method, which is the one most often used, is to call
|
|||
((and imenu-generic-expression)
|
||||
(imenu--generic-function imenu-generic-expression))
|
||||
(t
|
||||
(user-error "This buffer cannot use `imenu-default-create-index-function'"))))
|
||||
(imenu-unavailable-error "This buffer cannot use `imenu-default-create-index-function'"))))
|
||||
|
||||
;;;
|
||||
;;; Generic index gathering function.
|
||||
|
|
@ -956,8 +963,8 @@ See the command `imenu' for more information."
|
|||
`(menu-item ,name ,imenu--menubar-keymap))
|
||||
(use-local-map newmap)
|
||||
(add-hook 'menu-bar-update-hook 'imenu-update-menubar)))
|
||||
(user-error "The mode `%s' does not support Imenu"
|
||||
(format-mode-line mode-name))))
|
||||
(imenu-unavailable-error "The mode `%s' does not support Imenu"
|
||||
(format-mode-line mode-name))))
|
||||
|
||||
;;;###autoload
|
||||
(defun imenu-add-menubar-index ()
|
||||
|
|
|
|||
|
|
@ -3763,7 +3763,7 @@ Build a menu of the possible matches."
|
|||
;; I think nxml is the only exception - maybe it should be just be renamed.
|
||||
(let ((str (ignore-errors (lm-commentary (find-library-name nodename)))))
|
||||
(if (null str)
|
||||
(insert "Can't find package description.\n\n")
|
||||
(insert "Can’t find package description.\n\n")
|
||||
(insert
|
||||
(with-temp-buffer
|
||||
(insert str)
|
||||
|
|
|
|||
|
|
@ -967,7 +967,8 @@ is a list of CCL-BLOCKs."
|
|||
(let ((len (length ccl-code))
|
||||
(buffer-mag (aref ccl-code 0)))
|
||||
(cond ((= buffer-mag 0)
|
||||
(insert "Don't output anything.\n"))
|
||||
(insert (substitute-command-keys
|
||||
"Don’t output anything.\n")))
|
||||
((= buffer-mag 1)
|
||||
(insert "Out-buffer must be as large as in-buffer.\n"))
|
||||
(t
|
||||
|
|
@ -1127,7 +1128,7 @@ is a list of CCL-BLOCKs."
|
|||
|
||||
(defun ccl-dump-call (ignore cc)
|
||||
(let ((subroutine (car (ccl-get-next-code))))
|
||||
(insert (format "call subroutine `%s'\n" subroutine))))
|
||||
(insert (format-message "call subroutine `%s'\n" subroutine))))
|
||||
|
||||
(defun ccl-dump-write-const-string (rrr cc)
|
||||
(if (= rrr 0)
|
||||
|
|
|
|||
|
|
@ -109,13 +109,14 @@ without okurigana are placed at the head of the returned list."
|
|||
(load-library "ja-dic/ja-dic")
|
||||
(error (ding)
|
||||
(with-output-to-temp-buffer "*Help*"
|
||||
(princ "The library `ja-dic' can't be loaded.
|
||||
(princ (substitute-command-keys "\
|
||||
The library `ja-dic' can't be loaded.
|
||||
|
||||
The most common case is that you have not yet installed the library
|
||||
included in LEIM (Libraries of Emacs Input Method) which is
|
||||
distributed separately from Emacs.
|
||||
|
||||
LEIM is available from the same ftp directory as Emacs."))
|
||||
LEIM is available from the same ftp directory as Emacs.")))
|
||||
(signal (car err) (cdr err)))))
|
||||
|
||||
(let ((vec (make-vector len 0))
|
||||
|
|
|
|||
|
|
@ -744,7 +744,8 @@ e.g., for sending an email message.\n ")
|
|||
(when unsafe
|
||||
(insert (if rejected "The other coding systems"
|
||||
"However, each of them")
|
||||
" encountered characters it couldn't encode:\n")
|
||||
(substitute-command-keys
|
||||
" encountered characters it couldn't encode:\n"))
|
||||
(dolist (coding unsafe)
|
||||
(insert (format " %s cannot encode these:" (car coding)))
|
||||
(let ((i 0)
|
||||
|
|
@ -1285,9 +1286,9 @@ Emacs loads this file at startup time.")
|
|||
;; INPUT-METHOD LANGUAGE-NAME ACTIVATE-FUNC
|
||||
;; TITLE DESCRIPTION
|
||||
;; ARG ...)
|
||||
;; See the function `register-input-method' for the meanings of the arguments.
|
||||
;; See the function ‘register-input-method’ for the meanings of the arguments.
|
||||
;;
|
||||
;; If this directory is included in `load-path', Emacs automatically
|
||||
;; If this directory is included in ‘load-path’, Emacs automatically
|
||||
;; loads this file at startup time.
|
||||
|
||||
"
|
||||
|
|
|
|||
|
|
@ -252,15 +252,16 @@ This activates input method defined by PACKAGE-NAME by running
|
|||
(with-output-to-temp-buffer "*Help*"
|
||||
(princ "Quail package \"")
|
||||
(princ package-name)
|
||||
(princ "\" can't be activated\n because library \"")
|
||||
(princ (substitute-command-keys
|
||||
"\" can't be activated\n because library \""))
|
||||
(princ (car libraries))
|
||||
(princ "\" is not in `load-path'.
|
||||
(princ (substitute-command-keys "\" is not in `load-path'.
|
||||
|
||||
The most common case is that you have not yet installed appropriate
|
||||
libraries in LEIM (Libraries of Emacs Input Method) which is
|
||||
distributed separately from Emacs.
|
||||
|
||||
LEIM is available from the same ftp directory as Emacs."))
|
||||
LEIM is available from the same ftp directory as Emacs.")))
|
||||
(error "Can't use the Quail package `%s'" package-name))
|
||||
(setq libraries (cdr libraries))))))
|
||||
(quail-select-package package-name)
|
||||
|
|
@ -625,7 +626,7 @@ While this input method is active, the variable
|
|||
"Standard keyboard layout of printable characters Quail assumes.
|
||||
See the documentation of `quail-keyboard-layout' for this format.
|
||||
This layout is almost the same as that of VT100,
|
||||
but the location of key \\ (backslash) is just right of key ' (single-quote),
|
||||
but the location of key \\ (backslash) is just right of key \\=' (single-quote),
|
||||
not right of RETURN key.")
|
||||
|
||||
(defconst quail-keyboard-layout-len 180)
|
||||
|
|
@ -2533,35 +2534,37 @@ package to describe."
|
|||
(let ((done-list nil))
|
||||
;; Show keyboard layout if the current package requests it..
|
||||
(when (quail-show-layout)
|
||||
(insert "
|
||||
(insert (substitute-command-keys "
|
||||
KEYBOARD LAYOUT
|
||||
---------------
|
||||
This input method works by translating individual input characters.
|
||||
Assuming that your actual keyboard has the `")
|
||||
Assuming that your actual keyboard has the `"))
|
||||
(help-insert-xref-button
|
||||
quail-keyboard-layout-type
|
||||
'quail-keyboard-layout-button
|
||||
quail-keyboard-layout-type)
|
||||
(insert "' layout,
|
||||
(insert (substitute-command-keys "' layout,
|
||||
translation results in the following \"virtual\" keyboard layout
|
||||
\(the labels on the keys indicate what character will be produced
|
||||
by each key, with and without holding Shift):
|
||||
")
|
||||
"))
|
||||
(setq done-list
|
||||
(quail-insert-kbd-layout quail-keyboard-layout))
|
||||
(insert "If your keyboard has a different layout, rearranged from
|
||||
`")
|
||||
(insert (substitute-command-keys "\
|
||||
If your keyboard has a different layout, rearranged from
|
||||
`"))
|
||||
(help-insert-xref-button
|
||||
"standard"
|
||||
'quail-keyboard-layout-button "standard")
|
||||
(insert "', the \"virtual\" keyboard you get with this input method
|
||||
(insert (substitute-command-keys "\
|
||||
', the \"virtual\" keyboard you get with this input method
|
||||
will be rearranged in the same way.
|
||||
|
||||
You can set the variable `quail-keyboard-layout-type' to specify
|
||||
the physical layout of your keyboard; the tables shown in
|
||||
documentation of input methods including this one are based on the
|
||||
physical keyboard layout as specified with that variable.
|
||||
")
|
||||
"))
|
||||
(help-insert-xref-button
|
||||
"[customize keyboard layout]"
|
||||
'quail-keyboard-customize-button 'quail-keyboard-layout-type)
|
||||
|
|
|
|||
|
|
@ -273,7 +273,8 @@ SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy
|
|||
(princ ";; Quail package `")
|
||||
(princ package)
|
||||
(princ "\n")
|
||||
(princ ";; Generated by the command `titdic-convert'\n")
|
||||
(princ (substitute-command-keys
|
||||
";; Generated by the command `titdic-convert'\n"))
|
||||
(princ ";;\tOriginal TIT dictionary file: ")
|
||||
(princ (file-name-nondirectory filename))
|
||||
(princ "\n\n")
|
||||
|
|
@ -1150,8 +1151,9 @@ the generated Quail package is saved."
|
|||
(setq coding-system-for-write
|
||||
(coding-system-change-eol-conversion coding 'unix))
|
||||
(with-temp-file (expand-file-name quailfile dirname)
|
||||
(insert (format ";; Quail package `%s'\n" name))
|
||||
(insert ";; Generated by the command `miscdic-convert'\n")
|
||||
(insert (format-message ";; Quail package `%s'\n" name))
|
||||
(insert (format-message
|
||||
";; Generated by the command `miscdic-convert'\n"))
|
||||
(insert ";; Source dictionary file: " dicfile "\n")
|
||||
(insert ";; Copyright notice of the source file\n")
|
||||
(insert ";;------------------------------------------------------\n")
|
||||
|
|
|
|||
|
|
@ -710,6 +710,7 @@ Type \\[isearch-toggle-invisible] to toggle search in invisible text.
|
|||
Type \\[isearch-toggle-regexp] to toggle regular-expression mode.
|
||||
Type \\[isearch-toggle-word] to toggle word mode.
|
||||
Type \\[isearch-toggle-symbol] to toggle symbol mode.
|
||||
Type \\[isearch-toggle-character-fold] to toggle character folding.
|
||||
|
||||
Type \\[isearch-toggle-lax-whitespace] to toggle whitespace matching.
|
||||
In incremental searches, a space or spaces normally matches any whitespace
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ representation will be parsed correctly."
|
|||
(defun json-read-string ()
|
||||
"Read the JSON string at point."
|
||||
(unless (char-equal (json-peek) ?\")
|
||||
(signal 'json-string-format (list "doesn't start with '\"'!")))
|
||||
(signal 'json-string-format (list "doesn’t start with ‘\"’!")))
|
||||
;; Skip over the '"'
|
||||
(json-advance)
|
||||
(let ((characters '())
|
||||
|
|
|
|||
1009
lisp/ldefs-boot.el
1009
lisp/ldefs-boot.el
File diff suppressed because it is too large
Load diff
|
|
@ -60,7 +60,7 @@ S-SPC or `M-x ethio-insert-ethio-space'
|
|||
Always insert an Ethiopic word separator `፡'. With a prefix number,
|
||||
insert that many word separators.
|
||||
|
||||
C-' or `M-x ethio-gemination'
|
||||
C-\\=' or `M-x ethio-gemination'
|
||||
Compose the character before the point with the Ethiopic gemination mark.
|
||||
If the character is already composed, decompose it and remove the
|
||||
gemination mark."
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ usually do not have translators for other languages.\n\n")))
|
|||
|
||||
(insert "Please describe exactly what actions triggered the bug, and\n"
|
||||
"the precise symptoms of the bug. If you can, give a recipe\n"
|
||||
"starting from `emacs -Q':\n\n")
|
||||
"starting from 'emacs -Q':\n\n")
|
||||
(let ((txt (delete-and-extract-region
|
||||
(save-excursion (rfc822-goto-eoh) (line-beginning-position 2))
|
||||
(point))))
|
||||
|
|
@ -225,7 +225,7 @@ usually do not have translators for other languages.\n\n")))
|
|||
|
||||
(insert "If Emacs crashed, and you have the Emacs process in the gdb debugger,\n"
|
||||
"please include the output from the following gdb commands:\n"
|
||||
" `bt full' and `xbacktrace'.\n")
|
||||
" 'bt full' and 'xbacktrace'.\n")
|
||||
|
||||
(let ((debug-file (expand-file-name "DEBUG" data-directory)))
|
||||
(if (file-readable-p debug-file)
|
||||
|
|
@ -240,7 +240,7 @@ usually do not have translators for other languages.\n\n")))
|
|||
(if (fboundp 'x-server-vendor)
|
||||
(condition-case nil
|
||||
;; This is used not only for X11 but also W32 and others.
|
||||
(insert "Windowing system distributor `" (x-server-vendor)
|
||||
(insert "Windowing system distributor '" (x-server-vendor)
|
||||
"', version "
|
||||
(mapconcat 'number-to-string (x-server-version) ".") "\n")
|
||||
(error t)))
|
||||
|
|
@ -253,7 +253,7 @@ usually do not have translators for other languages.\n\n")))
|
|||
(insert "System " lsb "\n")))
|
||||
(when (and system-configuration-options
|
||||
(not (equal system-configuration-options "")))
|
||||
(insert "Configured using:\n `configure "
|
||||
(insert "Configured using:\n 'configure "
|
||||
system-configuration-options "'\n\n")
|
||||
(fill-region (line-beginning-position -1) (point)))
|
||||
(insert "Configured features:\n" system-configuration-features "\n\n")
|
||||
|
|
@ -315,7 +315,7 @@ usually do not have translators for other languages.\n\n")))
|
|||
|
||||
(insert (format "\nMemory information:\n"))
|
||||
(pp (garbage-collect) (current-buffer))
|
||||
|
||||
|
||||
;; This is so the user has to type something in order to send easily.
|
||||
(use-local-map (nconc (make-sparse-keymap) (current-local-map)))
|
||||
(define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug)
|
||||
|
|
@ -417,7 +417,7 @@ and send the mail again%s."
|
|||
(regexp-quote (system-name)))
|
||||
from))
|
||||
(not (yes-or-no-p
|
||||
(format "Is `%s' really your email address? " from)))
|
||||
(format "Is '%s' really your email address? " from)))
|
||||
(error "Please edit the From address and try again"))))))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1889,7 +1889,8 @@ with various lower-level mechanisms to provide features such as queueing."
|
|||
(defun feedmail-message-action-help-blat (d-string)
|
||||
(feedmail-say-debug ">in-> feedmail-message-action-help-blat")
|
||||
(with-output-to-temp-buffer feedmail-p-h-b-n
|
||||
(princ "You're dispatching a message and feedmail queuing is enabled.
|
||||
(princ (substitute-command-keys "\
|
||||
You're dispatching a message and feedmail queuing is enabled.
|
||||
Typing ? again will normally scroll this help buffer.
|
||||
|
||||
Choices:
|
||||
|
|
@ -1914,7 +1915,7 @@ Synonyms:
|
|||
y YUP do the default behavior \(same as \"C-m\"\)
|
||||
SPC SCROLL UP \(same as \">\"\)
|
||||
|
||||
The user-configurable default is currently \"")
|
||||
The user-configurable default is currently \""))
|
||||
(princ d-string)
|
||||
(princ "\". For other possibilities,
|
||||
see the variable feedmail-prompt-before-queue-user-alist.
|
||||
|
|
|
|||
|
|
@ -894,7 +894,7 @@ isn't provided."
|
|||
(error
|
||||
(display-warning
|
||||
'rmail
|
||||
(format "Although MIME support is requested
|
||||
(format-message "Although MIME support is requested
|
||||
through `rmail-enable-mime' being non-nil, the required feature
|
||||
`%s' (the value of `rmail-mime-feature')
|
||||
is not available in the current session.
|
||||
|
|
@ -2662,8 +2662,8 @@ Ask the user whether to add that list name to `mail-mailing-lists'."
|
|||
"\\>\\)"))
|
||||
addr))
|
||||
(y-or-n-p
|
||||
(format "Add `%s' to `mail-mailing-lists'? "
|
||||
addr)))
|
||||
(format-message "Add `%s' to `mail-mailing-lists'? "
|
||||
addr)))
|
||||
(customize-save-variable 'mail-mailing-lists
|
||||
(cons addr mail-mailing-lists)))))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -85,8 +85,11 @@ This uses `rmail-output-file-alist'."
|
|||
(error
|
||||
(display-warning
|
||||
:error
|
||||
(format "Error evaluating \
|
||||
`rmail-output-file-alist' element:\nregexp: %s\naction: %s\nerror: %S\n"
|
||||
(format-message "\
|
||||
Error evaluating `rmail-output-file-alist' element:
|
||||
regexp: %s
|
||||
action: %s
|
||||
error: %S\n"
|
||||
(caar tail) (cdar tail) err))
|
||||
nil))))
|
||||
(setq tail (cdr tail)))
|
||||
|
|
|
|||
|
|
@ -1353,8 +1353,8 @@ show window is toggled off."
|
|||
This option is consulted when a prefix argument is used with
|
||||
\\[mh-sort-folder]. Normally default arguments to \"sortm\" are
|
||||
specified in the MH profile. This option may be used to provide
|
||||
an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
|
||||
\"subject\")\" is a useful setting."
|
||||
an alternate view. For example, ‘(\"-nolimit\" \"-textfield\"
|
||||
\"subject\")’ is a useful setting."
|
||||
:type '(repeat string)
|
||||
:group 'mh-folder
|
||||
:package-version '(MH-E . "8.0"))
|
||||
|
|
|
|||
|
|
@ -850,15 +850,16 @@ t if it successfully authenticates, nil otherwise."
|
|||
(while (or (not user) (not passwd))
|
||||
(setq user (or imap-username
|
||||
(read-from-minibuffer
|
||||
(concat "imap: username for " imap-server
|
||||
" (using stream `" (symbol-name imap-stream)
|
||||
"'): ")
|
||||
(format-message
|
||||
"imap: username for %s (using stream ‘%s’): "
|
||||
imap-server imap-stream)
|
||||
(or user imap-default-user))))
|
||||
(setq passwd (or imap-password
|
||||
(read-passwd
|
||||
(concat "imap: password for " user "@"
|
||||
imap-server " (using authenticator `"
|
||||
(symbol-name imap-auth) "'): "))))
|
||||
(setq passwd
|
||||
(or imap-password
|
||||
(read-passwd
|
||||
(format-message
|
||||
"imap: password for %s@%s (using authenticator ‘%s’): "
|
||||
user imap-server imap-auth))))
|
||||
(when (and user passwd)
|
||||
(if (funcall loginfunc user passwd)
|
||||
(progn
|
||||
|
|
|
|||
|
|
@ -174,6 +174,12 @@ Used by `tls-certificate-information'."
|
|||
:type 'string
|
||||
:group 'tls)
|
||||
|
||||
(eval-and-compile
|
||||
(if (fboundp 'format-message)
|
||||
(defalias 'tls-format-message 'format-message)
|
||||
;; for Emacs < 25, and XEmacs, don't worry about quote translation.
|
||||
(defalias 'tls-format-message 'format)))
|
||||
|
||||
(defun tls-certificate-information (der)
|
||||
"Parse X.509 certificate in DER format into an assoc list."
|
||||
(let ((certificate (concat "-----BEGIN CERTIFICATE-----\n"
|
||||
|
|
@ -275,8 +281,8 @@ Fourth arg PORT is an integer specifying a port to connect to."
|
|||
(message "The certificate presented by `%s' is \
|
||||
NOT trusted." host))
|
||||
(not (yes-or-no-p
|
||||
(format "The certificate presented by `%s' is \
|
||||
NOT trusted. Accept anyway? " host)))))
|
||||
(tls-format-message "\
|
||||
The certificate presented by `%s' is NOT trusted. Accept anyway? " host)))))
|
||||
(and tls-hostmismatch
|
||||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
|
|
|
|||
|
|
@ -5114,18 +5114,10 @@ raises an error."
|
|||
Convert file mode bits to string and set virtual device number.
|
||||
Return ATTR."
|
||||
(when attr
|
||||
;; Convert symlink from `tramp-do-file-attributes-with-stat'.
|
||||
(when (consp (car attr))
|
||||
(if (and (stringp (caar attr))
|
||||
(string-match ".+ -> .\\(.+\\)." (caar attr)))
|
||||
(setcar attr (match-string 1 (caar attr)))
|
||||
(setcar attr nil)))
|
||||
;; Remove color escape sequences and double slashes from symlink.
|
||||
;; Remove color escape sequences from symlink.
|
||||
(when (stringp (car attr))
|
||||
(while (string-match tramp-color-escape-sequence-regexp (car attr))
|
||||
(setcar attr (replace-match "" nil nil (car attr))))
|
||||
(while (string-match "//" (car attr))
|
||||
(setcar attr (replace-match "/" nil nil (car attr)))))
|
||||
(setcar attr (replace-match "" nil nil (car attr)))))
|
||||
;; Convert uid and gid. Use -1 as indication of unusable value.
|
||||
(when (and (numberp (nth 2 attr)) (< (nth 2 attr) 0))
|
||||
(setcar (nthcdr 2 attr) -1))
|
||||
|
|
@ -5166,6 +5158,12 @@ Return ATTR."
|
|||
;; Convert directory indication bit.
|
||||
(when (string-match "^d" (nth 8 attr))
|
||||
(setcar attr t))
|
||||
;; Convert symlink from `tramp-do-file-attributes-with-stat'.
|
||||
(when (consp (car attr))
|
||||
(if (and (stringp (caar attr))
|
||||
(string-match ".+ -> .\\(.+\\)." (caar attr)))
|
||||
(setcar attr (match-string 1 (caar attr)))
|
||||
(setcar attr nil)))
|
||||
;; Set file's gid change bit.
|
||||
(setcar (nthcdr 9 attr)
|
||||
(if (numberp (nth 3 attr))
|
||||
|
|
|
|||
|
|
@ -1266,7 +1266,7 @@ Else, call `comment-indent'.
|
|||
You can configure `comment-style' to change the way regions are commented."
|
||||
(interactive "*P")
|
||||
(comment-normalize-vars)
|
||||
(if (and mark-active transient-mark-mode)
|
||||
(if (use-region-p)
|
||||
(comment-or-uncomment-region (region-beginning) (region-end) arg)
|
||||
(if (save-excursion (beginning-of-line) (not (looking-at "\\s-*$")))
|
||||
;; FIXME: If there's no comment to kill on this line and ARG is
|
||||
|
|
|
|||
|
|
@ -65,7 +65,8 @@ If nil, the feature is disabled, i.e., all commands work normally.")
|
|||
(if (stringp (get cmd 'disabled))
|
||||
(princ (get cmd 'disabled))
|
||||
(princ "It is disabled because new users often find it confusing.\n")
|
||||
(princ "Here's the first part of its description:\n\n")
|
||||
(princ (substitute-command-keys
|
||||
"Here's the first part of its description:\n\n"))
|
||||
;; Keep only the first paragraph of the documentation.
|
||||
(with-current-buffer "*Disabled Command*" ;; standard-output
|
||||
(goto-char (point-max))
|
||||
|
|
@ -80,11 +81,11 @@ If nil, the feature is disabled, i.e., all commands work normally.")
|
|||
(goto-char (point-max))
|
||||
(indent-rigidly start (point) 3))))
|
||||
(princ "\n\nDo you want to use this command anyway?\n\n")
|
||||
(princ "You can now type
|
||||
(princ (substitute-command-keys "You can now type
|
||||
y to try it and enable it (no questions if you use it again).
|
||||
n to cancel--don't try the command, and it remains disabled.
|
||||
SPC to try the command just this once, but leave it disabled.
|
||||
! to try it, and enable all disabled commands for this session only.")
|
||||
! to try it, and enable all disabled commands for this session only."))
|
||||
;; Redundant since with-output-to-temp-buffer will do it anyway.
|
||||
;; (with-current-buffer standard-output
|
||||
;; (help-mode))
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ This will be spliced into the custom type of
|
|||
|
||||
|
||||
(defcustom org-agenda-custom-commands
|
||||
'(("n" "Agenda and all TODO's" ((agenda "") (alltodo ""))))
|
||||
'(("n" "Agenda and all TODOs" ((agenda "") (alltodo ""))))
|
||||
"Custom commands for the agenda.
|
||||
These commands will be offered on the splash screen displayed by the
|
||||
agenda dispatcher \\[org-agenda]. Each entry is a list like this:
|
||||
|
|
@ -3815,7 +3815,7 @@ FILTER-ALIST is an alist of filters we need to apply when
|
|||
(defvar org-depend-tag-blocked)
|
||||
|
||||
(defun org-agenda-dim-blocked-tasks (&optional invisible)
|
||||
"Dim currently blocked TODO's in the agenda display.
|
||||
"Dim currently blocked TODOs in the agenda display.
|
||||
When INVISIBLE is non-nil, hide currently blocked TODO instead of
|
||||
dimming them."
|
||||
(interactive "P")
|
||||
|
|
@ -4647,7 +4647,8 @@ in `org-agenda-text-search-extra-files'."
|
|||
(add-text-properties pos (1- (point)) (list 'face 'org-warning))
|
||||
(setq pos (point))
|
||||
(unless org-agenda-multi
|
||||
(insert "Press `[', `]' to add/sub word, `{', `}' to add/sub regexp, `C-u r' to edit\n")
|
||||
(insert (substitute-command-keys
|
||||
"Press `[', `]' to add/sub word, `{', `}' to add/sub regexp, `C-u r' to edit\n"))
|
||||
(add-text-properties pos (1- (point))
|
||||
(list 'face 'org-agenda-structure))))
|
||||
(org-agenda-mark-header-line (point-min))
|
||||
|
|
@ -4741,7 +4742,7 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
|
|||
org-select-this-todo-keyword))
|
||||
(setq pos (point))
|
||||
(unless org-agenda-multi
|
||||
(insert "Available with `N r': (0)[ALL]")
|
||||
(insert (substitute-command-keys "Available with `N r': (0)[ALL]"))
|
||||
(let ((n 0) s)
|
||||
(mapc (lambda (x)
|
||||
(setq s (format "(%d)%s" (setq n (1+ n)) x))
|
||||
|
|
@ -4836,7 +4837,8 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
|
|||
(add-text-properties pos (1- (point)) (list 'face 'org-warning))
|
||||
(setq pos (point))
|
||||
(unless org-agenda-multi
|
||||
(insert "Press `C-u r' to search again with new search string\n"))
|
||||
(insert (substitute-command-keys
|
||||
"Press `C-u r' to search again with new search string\n")))
|
||||
(add-text-properties pos (1- (point)) (list 'face 'org-agenda-structure)))
|
||||
(org-agenda-mark-header-line (point-min))
|
||||
(when rtnall
|
||||
|
|
|
|||
|
|
@ -434,7 +434,8 @@ Turning on this mode runs the normal hook `org-capture-mode-hook'."
|
|||
nil " Rem" org-capture-mode-map
|
||||
(org-set-local
|
||||
'header-line-format
|
||||
"Capture buffer. Finish `C-c C-c', refile `C-c C-w', abort `C-c C-k'."))
|
||||
(substitute-command-keys
|
||||
"Capture buffer. Finish `C-c C-c', refile `C-c C-w', abort `C-c C-k'.")))
|
||||
(define-key org-capture-mode-map "\C-c\C-c" 'org-capture-finalize)
|
||||
(define-key org-capture-mode-map "\C-c\C-k" 'org-capture-kill)
|
||||
(define-key org-capture-mode-map "\C-c\C-w" 'org-capture-refile)
|
||||
|
|
@ -1600,7 +1601,7 @@ The template may still contain \"%?\" for cursor positioning."
|
|||
(delete-region start end)
|
||||
(condition-case error
|
||||
(insert-file-contents filename)
|
||||
(error (insert (format "%%![Couldn't insert %s: %s]"
|
||||
(error (insert (format "%%![Could not insert %s: %s]"
|
||||
filename error)))))))
|
||||
;; %() embedded elisp
|
||||
(org-capture-expand-embedded-elisp)
|
||||
|
|
|
|||
|
|
@ -418,6 +418,10 @@ Pass BUFFER to the XEmacs version of `move-to-column'."
|
|||
(unless (fboundp 'user-error)
|
||||
(defalias 'user-error 'error))
|
||||
|
||||
;; ‘format-message’ is available only from 25 on
|
||||
(unless (fboundp 'format-message)
|
||||
(defalias 'format-message 'format))
|
||||
|
||||
(defmacro org-no-popups (&rest body)
|
||||
"Suppress popup windows.
|
||||
Let-bind some variables to nil around BODY to achieve the desired
|
||||
|
|
|
|||
|
|
@ -394,7 +394,8 @@ the new file."
|
|||
(org-open-file filename t))
|
||||
((or (eql create t)
|
||||
(and (eql create 'ask)
|
||||
(y-or-n-p (format "File `%s.org' not found; create?" name))))
|
||||
(y-or-n-p (format-message
|
||||
"File `%s.org' not found; create?" name))))
|
||||
(org-ctags-open-file filename name))
|
||||
(t ;; File does not exist, and we don't want to create it.
|
||||
nil))))
|
||||
|
|
@ -433,8 +434,8 @@ the heading a destination for the tag `NAME'."
|
|||
"This function is intended to be used in ORG-OPEN-LINK-FUNCTIONS.
|
||||
Wrapper for org-ctags-append-topic, which first asks the user if they want
|
||||
to append a new topic."
|
||||
(if (y-or-n-p (format "Topic `%s' not found; append to end of buffer?"
|
||||
name))
|
||||
(if (y-or-n-p (format-message
|
||||
"Topic `%s' not found; append to end of buffer?" name))
|
||||
(org-ctags-append-topic name narrowp)
|
||||
nil))
|
||||
|
||||
|
|
|
|||
|
|
@ -801,7 +801,7 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
|
|||
"Save parent buffer with current state source-code buffer."
|
||||
(interactive)
|
||||
(if (string-match "Fixed Width" (buffer-name))
|
||||
(user-error "Use C-c ' to save and exit, C-c C-k to abort editing")
|
||||
(user-error "%s" "Use C-c ' to save and exit, C-c C-k to abort editing")
|
||||
(org-src-in-org-buffer (save-buffer))))
|
||||
|
||||
(declare-function org-babel-tangle "ob-tangle" (&optional arg target-file lang))
|
||||
|
|
|
|||
|
|
@ -6629,7 +6629,7 @@ in special contexts.
|
|||
;; Table: enter it or move to the next field.
|
||||
((org-at-table-p 'any)
|
||||
(if (org-at-table.el-p)
|
||||
(message "Use C-c ' to edit table.el tables")
|
||||
(message "%s" "Use C-c ' to edit table.el tables")
|
||||
(if arg (org-table-edit-field t)
|
||||
(org-table-justify-field-maybe)
|
||||
(call-interactively 'org-table-next-field))))
|
||||
|
|
@ -17102,7 +17102,7 @@ days in order to avoid rounding problems."
|
|||
(error (error "Bad timestamp `%s'%s\nError was: %s"
|
||||
s (if (not (and buffer pos))
|
||||
""
|
||||
(format " at %d in buffer `%s'" pos buffer))
|
||||
(format-message " at %d in buffer `%s'" pos buffer))
|
||||
(cdr errdata)))))
|
||||
|
||||
(defun org-time-string-to-seconds (s)
|
||||
|
|
@ -17130,7 +17130,7 @@ The variable `date' is bound by the calendar when this is called."
|
|||
(error (error "Bad timestamp `%s'%s\nError was: %s"
|
||||
s (if (not (and buffer pos))
|
||||
""
|
||||
(format " at %d in buffer `%s'" pos buffer))
|
||||
(format-message " at %d in buffer `%s'" pos buffer))
|
||||
(cdr errdata))))))))
|
||||
|
||||
(defun org-days-to-iso-week (days)
|
||||
|
|
@ -20446,7 +20446,7 @@ This command does many different things, depending on context:
|
|||
;; a `table.el' type, just give up. At a table row or
|
||||
;; cell, maybe recalculate line but always align table.
|
||||
(if (eq (org-element-property :type context) 'table.el)
|
||||
(message "Use C-c ' to edit table.el tables")
|
||||
(message "%s" "Use C-c ' to edit table.el tables")
|
||||
(let ((org-enable-table-editor t))
|
||||
(if (or (eq type 'table)
|
||||
;; Check if point is at a TBLFM line.
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue