[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog xdisp.c
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/src ChangeLog xdisp.c |
Date: |
Mon, 28 Sep 2009 02:01:54 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/09/28 02:01:54
Modified files:
src : ChangeLog xdisp.c
Log message:
(get_next_display_element): Use an enum in last change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7774&r2=1.7775
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1305&r2=1.1306
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7774
retrieving revision 1.7775
diff -u -b -r1.7774 -r1.7775
--- ChangeLog 28 Sep 2009 01:05:20 -0000 1.7774
+++ ChangeLog 28 Sep 2009 02:01:52 -0000 1.7775
@@ -1,6 +1,10 @@
+2009-09-28 Stefan Monnier <address@hidden>
+
+ * xdisp.c (get_next_display_element): Use an enum in last change.
+
2009-09-28 Kenichi Handa <address@hidden>
- * 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 <address@hidden>
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1305
retrieving revision 1.1306
diff -u -b -r1.1305 -r1.1306
--- xdisp.c 28 Sep 2009 01:05:00 -0000 1.1305
+++ xdisp.c 28 Sep 2009 02:01:53 -0000 1.1306
@@ -5684,9 +5684,8 @@
{
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 @@
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 @@
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 @@
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 @@
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;