Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
9694740b
Commit
9694740b
authored
Sep 28, 2009
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(get_next_display_element): Use an enum in last change.
parent
748e3d67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
11 deletions
+18
-11
src/ChangeLog
src/ChangeLog
+7
-3
src/xdisp.c
src/xdisp.c
+11
-8
No files found.
src/ChangeLog
View file @
9694740b
2009-09-28 Stefan Monnier <monnier@iro.umontreal.ca>
* xdisp.c (get_next_display_element): Use an enum in last change.
2009-09-28 Kenichi Handa <handa@m17n.org>
* xdisp.c: Pay attention to
* xdisp.c
(get_next_display_element)
: Pay attention to
unibyte_display_via_language_environment in handling
Vnobreak_char_display.
...
...
@@ -19,8 +23,8 @@
(ns_set_name_as_filename, x-create-frame, ns-get-resource)
(ns-set-resource): Use ns_app_name instead of NSProcessInfo call.
* menu.c (find_and_return_menu_selection) [HAVE_NS]:
Remove
double-casting in client_data comparison.
* menu.c (find_and_return_menu_selection) [HAVE_NS]:
Remove
double-casting in client_data comparison.
2009-09-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
...
...
src/xdisp.c
View file @
9694740b
...
...
@@ -5684,9 +5684,8 @@ get_next_display_element (it)
{
Lisp_Object dv;
struct charset *unibyte = CHARSET_FROM_ID (charset_unibyte);
int nbsp_or_shy = 0; /* 1:NO-BREAK SPACE, 2:SOFT HYPHEN, 0:ELSE */
#define IS_NBSP (nbsp_or_shy == 1)
#define IS_SHY (nbsp_or_shy == 2)
enum { char_is_other = 0, char_is_nbsp, char_is_soft_hyphen }
nbsp_or_shy = char_is_other;
int decoded = it->c;
if (it->dp
...
...
@@ -5723,9 +5722,13 @@ get_next_display_element (it)
if (it->c >= 0x80 && ! NILP (Vnobreak_char_display))
{
if (it->multibyte_p)
nbsp_or_shy = it->c == 0xA0 ? 1 : it->c == 0xAD ? 2 : 0;
nbsp_or_shy = (it->c == 0xA0 ? char_is_nbsp
: it->c == 0xAD ? char_is_soft_hyphen
: char_is_other);
else if (unibyte_display_via_language_environment)
nbsp_or_shy = decoded == 0xA0 ? 1 : decoded == 0xAD ? 2 : 0;
nbsp_or_shy = (decoded == 0xA0 ? char_is_nbsp
: decoded == 0xAD ? char_is_soft_hyphen
: char_is_other);
}
/* Translate control characters into `\003' or `^C' form.
...
...
@@ -5808,7 +5811,7 @@ get_next_display_element (it)
highlighting. */
if (EQ (Vnobreak_char_display, Qt)
&&
IS_NBSP
)
&&
nbsp_or_shy == char_is_nbsp
)
{
/* Merge the no-break-space face into the current face. */
face_id = merge_faces (it->f, Qnobreak_space, 0,
...
...
@@ -5858,7 +5861,7 @@ get_next_display_element (it)
highlighting. */
if (EQ (Vnobreak_char_display, Qt)
&&
IS_SHY
)
&&
nbsp_or_shy == char_is_soft_hyphen
)
{
it->c = '-';
XSETINT (it->ctl_chars[0], '-');
...
...
@@ -5872,7 +5875,7 @@ get_next_display_element (it)
if (nbsp_or_shy)
{
XSETINT (it->ctl_chars[0], escape_glyph);
it->c = (
IS_NBSP
? ' ' : '-');
it->c = (
nbsp_or_shy == char_is_nbsp
? ' ' : '-');
XSETINT (it->ctl_chars[1], it->c);
ctl_len = 2;
goto display_control;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment