procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
95a0227ff7 (origin/emacs-28) Avoid exiting when outputting error mess...
b7ae0232be ; * src/Makefile.in (../native-lisp): More tweaks of the r...
6e79f8a444 Remove implemented emoji items
00bcba5125 project.el NEWS tagging
704a39f508 thing-at-mouse NEWS tagging
3a9d5f04fb Mention ffap-file-name-with-spaces in the ffap doc strin

# Conflicts:
#	etc/NEWS
This commit is contained in:
Glenn Morris 2021-10-04 08:13:12 -07:00
commit 10e3bc610b
5 changed files with 15 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/NEWS.28
View file

@ -2424,8 +2424,10 @@ Those are 'shr-h1', 'shr-h2', 'shr-h3', 'shr-h4', 'shr-h5', 'shr-h6'.
** Project
---
*** New user option 'project-vc-merge-submodules'.
---
*** Project commands now have their own history.
Previously used project directories are now suggested by all commands
that prompt for a project directory.
@ -2652,7 +2654,9 @@ This allows mode-specific alterations to how 'thing-at-point' works.
'symbol-at-point') will narrow to the current field (if any) before
trying to identify the thing at point.
---
*** New function 'thing-at-mouse'.
This is like 'thing-at-point', but uses the mouse event position instead.
** image-dired

28
etc/TODO
View file

@ -370,34 +370,6 @@ Emacs is capable of displaying Emoji and some of the Emoji sequences,
provided that its fontsets are configured with a suitable font. To
make this easier out of the box, the following should be done:
*** Populate composition-function-table with Emoji rules
The Unicode Character Database (UCD) includes several data files that
define the valid Emoji sequences. These files should be imported into
the Emacs tree, and should be converted by some script at Emacs build
time to Lisp code that populates composition-function-table with the
corresponding composition rules.
*** Augment the default fontsets with Emoji-capable fonts
The default fontsets set up by fontest.el should include known free
fonts that provide good support for displaying Emoji sequences. In
addition, the rule that the default face's font is used for symbol and
punctuation characters, disregarding the fontsets, should be modified
to exempt Emoji from this rule (since Emoji characters belong to the
'symbol' script in Emacs), so that use-default-font-for-symbols would
not have to be tweaked to have Emoji display by default with a capable
font. (This has now been implemented, but only one font is currently
considered, please augment the list).
*** Consider changing the default display of Variation Selectors
Emacs by default displays the Variation Selector (VS) codepoints not
composed with base characters as hex codes in a box. The Unicode FAQ
says that if variation sequences cannot be supported, the VS
characters should not be shown, leaving just the base character of the
sequence visible. This could be handled via glyphless-char-display,
by changing the entries for VS codepoints to 'zero-width'. Or we
could display them as a thin 1-pixel space, as we do with format
control characters, by using 'thin-space' there.
*** Special face for displaying text presentation of Emoji
Emoji-capable fonts support Emoji sequences with the U+FE0F VARIATION
SELECTOR-16 (VS16) for emoji-style display, but usually don't support

5
lisp/ffap.el
View file

@ -1639,8 +1639,9 @@ If `ffap-url-regexp' is not nil, the FILENAME may also be an URL.
With a prefix, this command behaves exactly like `ffap-file-finder'.
If `ffap-require-prefix' is set, the prefix meaning is reversed.
See also the variables `ffap-dired-wildcards', `ffap-newfile-prompt',
`ffap-url-unwrap-local', `ffap-url-unwrap-remote', and the functions
`ffap-file-at-point' and `ffap-url-at-point'."
`ffap-url-unwrap-local', `ffap-url-unwrap-remote',
`ffap-file-name-with-spaces', and the functions `ffap-file-at-point'
and `ffap-url-at-point'."
(interactive)
(if (and (called-interactively-p 'interactive)
(if ffap-require-prefix (not current-prefix-arg)

5
src/Makefile.in
View file

@ -807,8 +807,9 @@ elnlisp := $(addprefix ${lispsource}/,${elnlisp}) $(lisp:.elc=.eln)
if test ! -d $@; then \
mkdir $@ && $(MAKE) $(AM_V_NO_PD) $(elnlisp); \
LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=pdump \
--bin-dest $(BIN_DESTDIR) --eln-dest $(ELN_DESTDIR); \
cp -f $@ $(bootstrap_pdmp); \
--bin-dest $(BIN_DESTDIR) --eln-dest $(ELN_DESTDIR) \
&& cp -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT) \
&& cp -f $(pdmp) $(bootstrap_pdmp); \
fi
endif

6
src/print.c
View file

@ -941,7 +941,11 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context,
else
{
Lisp_Object error_conditions = Fget (errname, Qerror_conditions);
errmsg = call1 (Qsubstitute_command_keys, Fget (errname, Qerror_message));
errmsg = Fget (errname, Qerror_message);
/* During loadup 'substitute-command-keys' might not be available. */
if (!NILP (Ffboundp (Qsubstitute_command_keys)))
errmsg = call1 (Qsubstitute_command_keys, errmsg);
file_error = Fmemq (Qfile_error, error_conditions);
}