[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108627: * buffer.h (FETCH_MULTIBYTE_
|
From: |
Andreas Schwab |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108627: * buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline. |
|
Date: |
Sat, 16 Jun 2012 14:24:15 +0200 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108627
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2012-06-16 14:24:15 +0200
message:
* buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline.
(BUF_FETCH_MULTIBYTE_CHAR): Likewise.
* character.c (_fetch_multibyte_char_p): Remove.
* alloc.c: Include "character.h" before "buffer.h".
* bidi.c: Likewise.
* buffer.c: Likewise.
* bytecode.c: Likewise.
* callint.c: Likewise.
* callproc.c: Likewise.
* casefiddle.c: Likewise.
* casetab.c: Likewise.
* category.c: Likewise.
* cmds.c: Likewise.
* coding.c: Likewise.
* composite.c: Likewise.
* dired.c: Likewise.
* dispnew.c: Likewise.
* doc.c: Likewise.
* dosfns.c: Likewise.
* editfns.c: Likewise.
* emacs.c: Likewise.
* fileio.c: Likewise.
* filelock.c: Likewise.
* font.c: Likewise.
* fontset.c: Likewise.
* fringe.c: Likewise.
* indent.c: Likewise.
* insdel.c: Likewise.
* intervals.c: Likewise.
* keyboard.c: Likewise.
* keymap.c: Likewise.
* lread.c: Likewise.
* macros.c: Likewise.
* marker.c: Likewise.
* minibuf.c: Likewise.
* nsfns.m: Likewise.
* nsmenu.m: Likewise.
* print.c: Likewise.
* process.c: Likewise.
* regex.c: Likewise.
* region-cache.c: Likewise.
* search.c: Likewise.
* syntax.c: Likewise.
* term.c: Likewise.
* textprop.c: Likewise.
* undo.c: Likewise.
* unexsol.c: Likewise.
* w16select.c: Likewise.
* w32fns.c: Likewise.
* w32menu.c: Likewise.
* window.c: Likewise.
* xdisp.c: Likewise.
* xfns.c: Likewise.
* xmenu.c: Likewise.
* xml.c: Likewise.
* xselect.c: Likewise.
modified:
src/ChangeLog
src/alloc.c
src/bidi.c
src/buffer.c
src/buffer.h
src/bytecode.c
src/callint.c
src/callproc.c
src/casefiddle.c
src/casetab.c
src/category.c
src/character.c
src/cmds.c
src/coding.c
src/composite.c
src/dired.c
src/dispnew.c
src/doc.c
src/dosfns.c
src/editfns.c
src/emacs.c
src/fileio.c
src/filelock.c
src/font.c
src/fontset.c
src/fringe.c
src/indent.c
src/insdel.c
src/intervals.c
src/keyboard.c
src/keymap.c
src/lread.c
src/macros.c
src/marker.c
src/minibuf.c
src/nsfns.m
src/nsmenu.m
src/print.c
src/process.c
src/regex.c
src/region-cache.c
src/search.c
src/syntax.c
src/term.c
src/textprop.c
src/undo.c
src/unexsol.c
src/w16select.c
src/w32fns.c
src/w32menu.c
src/window.c
src/xdisp.c
src/xfns.c
src/xmenu.c
src/xml.c
src/xselect.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-16 11:47:44 +0000
+++ b/src/ChangeLog 2012-06-16 12:24:15 +0000
@@ -1,3 +1,62 @@
+2012-06-16 Andreas Schwab <address@hidden>
+
+ * buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline.
+ (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
+ * character.c (_fetch_multibyte_char_p): Remove.
+ * alloc.c: Include "character.h" before "buffer.h".
+ * bidi.c: Likewise.
+ * buffer.c: Likewise.
+ * bytecode.c: Likewise.
+ * callint.c: Likewise.
+ * callproc.c: Likewise.
+ * casefiddle.c: Likewise.
+ * casetab.c: Likewise.
+ * category.c: Likewise.
+ * cmds.c: Likewise.
+ * coding.c: Likewise.
+ * composite.c: Likewise.
+ * dired.c: Likewise.
+ * dispnew.c: Likewise.
+ * doc.c: Likewise.
+ * dosfns.c: Likewise.
+ * editfns.c: Likewise.
+ * emacs.c: Likewise.
+ * fileio.c: Likewise.
+ * filelock.c: Likewise.
+ * font.c: Likewise.
+ * fontset.c: Likewise.
+ * fringe.c: Likewise.
+ * indent.c: Likewise.
+ * insdel.c: Likewise.
+ * intervals.c: Likewise.
+ * keyboard.c: Likewise.
+ * keymap.c: Likewise.
+ * lread.c: Likewise.
+ * macros.c: Likewise.
+ * marker.c: Likewise.
+ * minibuf.c: Likewise.
+ * nsfns.m: Likewise.
+ * nsmenu.m: Likewise.
+ * print.c: Likewise.
+ * process.c: Likewise.
+ * regex.c: Likewise.
+ * region-cache.c: Likewise.
+ * search.c: Likewise.
+ * syntax.c: Likewise.
+ * term.c: Likewise.
+ * textprop.c: Likewise.
+ * undo.c: Likewise.
+ * unexsol.c: Likewise.
+ * w16select.c: Likewise.
+ * w32fns.c: Likewise.
+ * w32menu.c: Likewise.
+ * window.c: Likewise.
+ * xdisp.c: Likewise.
+ * xfns.c: Likewise.
+ * xmenu.c: Likewise.
+ * xml.c: Likewise.
+ * xselect.c: Likewise.
+
2012-06-16 Eli Zaretskii <address@hidden>
* xdisp.c (set_cursor_from_row): Don't dereference glyphs_end. If
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2012-06-13 13:40:48 +0000
+++ b/src/alloc.c 2012-06-16 12:24:15 +0000
@@ -38,12 +38,12 @@
#include "process.h"
#include "intervals.h"
#include "puresize.h"
+#include "character.h"
#include "buffer.h"
#include "window.h"
#include "keyboard.h"
#include "frame.h"
#include "blockinput.h"
-#include "character.h"
#include "syssignal.h"
#include "termhooks.h" /* For struct terminal. */
#include <setjmp.h>
=== modified file 'src/bidi.c'
--- a/src/bidi.c 2012-05-28 07:13:45 +0000
+++ b/src/bidi.c 2012-06-16 12:24:15 +0000
@@ -59,8 +59,8 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "dispextern.h"
static int bidi_initialized = 0;
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2012-06-06 06:39:24 +0000
+++ b/src/buffer.c 2012-06-16 12:24:15 +0000
@@ -33,8 +33,8 @@
#include "intervals.h"
#include "window.h"
#include "commands.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "region-cache.h"
#include "indent.h"
#include "blockinput.h"
=== modified file 'src/buffer.h'
--- a/src/buffer.h 2012-06-03 09:03:23 +0000
+++ b/src/buffer.h 2012-06-16 12:24:15 +0000
@@ -355,28 +355,6 @@
#define FETCH_BYTE(n) *(BYTE_POS_ADDR ((n)))
-/* Variables used locally in FETCH_MULTIBYTE_CHAR. */
-extern unsigned char *_fetch_multibyte_char_p;
-
-/* Return character code of multi-byte form at byte position POS. If POS
- doesn't point the head of valid multi-byte form, only the byte at
- POS is returned. No range checking.
-
- WARNING: The character returned by this macro could be "unified"
- inside STRING_CHAR, if the original character in the buffer belongs
- to one of the Private Use Areas (PUAs) of codepoints that Emacs
- uses to support non-unified CJK characters. If that happens,
- CHAR_BYTES will return a value that is different from the length of
- the original multibyte sequence stored in the buffer. Therefore,
- do _not_ use FETCH_MULTIBYTE_CHAR if you need to advance through
- the buffer to the next character after fetching this one. Instead,
- use either FETCH_CHAR_ADVANCE or STRING_CHAR_AND_LENGTH. */
-
-#define FETCH_MULTIBYTE_CHAR(pos) \
- (_fetch_multibyte_char_p = (((pos) >= GPT_BYTE ? GAP_SIZE : 0) \
- + (pos) + BEG_ADDR - BEG_BYTE), \
- STRING_CHAR (_fetch_multibyte_char_p))
-
/* Return character at byte position POS. If the current buffer is unibyte
and the character is not ASCII, make the returning character
multibyte. */
@@ -425,16 +403,6 @@
#define BUF_FETCH_BYTE(buf, n) \
*(BUF_BYTE_ADDRESS ((buf), (n)))
-
-/* Return character code of multi-byte form at byte position POS in BUF.
- If POS doesn't point the head of valid multi-byte form, only the byte at
- POS is returned. No range checking. */
-
-#define BUF_FETCH_MULTIBYTE_CHAR(buf, pos) \
- (_fetch_multibyte_char_p \
- = (((pos) >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0) \
- + (pos) + BUF_BEG_ADDR (buf) - BEG_BYTE), \
- STRING_CHAR (_fetch_multibyte_char_p))
/* Define the actual buffer data structures. */
@@ -945,7 +913,41 @@
extern Lisp_Object Qbefore_change_functions;
extern Lisp_Object Qafter_change_functions;
extern Lisp_Object Qfirst_change_hook;
-
+
+/* Return character code of multi-byte form at byte position POS. If POS
+ doesn't point the head of valid multi-byte form, only the byte at
+ POS is returned. No range checking.
+
+ WARNING: The character returned by this macro could be "unified"
+ inside STRING_CHAR, if the original character in the buffer belongs
+ to one of the Private Use Areas (PUAs) of codepoints that Emacs
+ uses to support non-unified CJK characters. If that happens,
+ CHAR_BYTES will return a value that is different from the length of
+ the original multibyte sequence stored in the buffer. Therefore,
+ do _not_ use FETCH_MULTIBYTE_CHAR if you need to advance through
+ the buffer to the next character after fetching this one. Instead,
+ use either FETCH_CHAR_ADVANCE or STRING_CHAR_AND_LENGTH. */
+
+static inline int
+FETCH_MULTIBYTE_CHAR (ptrdiff_t pos)
+{
+ unsigned char *p = ((pos >= GPT_BYTE ? GAP_SIZE : 0)
+ + pos + BEG_ADDR - BEG_BYTE);
+ return STRING_CHAR (p);
+}
+
+/* Return character code of multi-byte form at byte position POS in BUF.
+ If POS doesn't point the head of valid multi-byte form, only the byte at
+ POS is returned. No range checking. */
+
+static inline int
+BUF_FETCH_MULTIBYTE_CHAR (struct buffer *buf, ptrdiff_t pos)
+{
+ unsigned char *p
+ = ((pos >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0)
+ + pos + BUF_BEG_ADDR (buf) - BEG_BYTE);
+ return STRING_CHAR (p);
+}
/* Overlays */
=== modified file 'src/bytecode.c'
--- a/src/bytecode.c 2012-02-10 18:58:48 +0000
+++ b/src/bytecode.c 2012-06-16 12:24:15 +0000
@@ -35,8 +35,8 @@
#include <config.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "syntax.h"
#include "window.h"
=== modified file 'src/callint.c'
--- a/src/callint.c 2012-06-02 19:21:34 +0000
+++ b/src/callint.c 2012-06-16 12:24:15 +0000
@@ -22,12 +22,12 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "commands.h"
#include "keyboard.h"
#include "window.h"
#include "keymap.h"
-#include "character.h"
Lisp_Object Qminus, Qplus;
Lisp_Object Qcall_interactively;
=== modified file 'src/callproc.c'
--- a/src/callproc.c 2012-05-30 14:20:45 +0000
+++ b/src/callproc.c 2012-06-16 12:24:15 +0000
@@ -44,8 +44,8 @@
#endif /* MSDOS */
#include "commands.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "ccl.h"
#include "coding.h"
#include "composite.h"
=== modified file 'src/casefiddle.c'
--- a/src/casefiddle.c 2012-02-10 18:58:48 +0000
+++ b/src/casefiddle.c 2012-06-16 12:24:15 +0000
@@ -21,8 +21,8 @@
#include <config.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "commands.h"
#include "syntax.h"
#include "composite.h"
=== modified file 'src/casetab.c'
--- a/src/casetab.c 2012-02-10 18:58:48 +0000
+++ b/src/casetab.c 2012-06-16 12:24:15 +0000
@@ -21,8 +21,8 @@
#include <config.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
static Lisp_Object Qcase_table_p, Qcase_table;
Lisp_Object Vascii_downcase_table;
=== modified file 'src/category.c'
--- a/src/category.c 2012-06-16 08:20:19 +0000
+++ b/src/category.c 2012-06-16 12:24:15 +0000
@@ -32,8 +32,8 @@
#include <ctype.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "category.h"
#include "keymap.h"
=== modified file 'src/character.c'
--- a/src/character.c 2012-02-10 18:58:48 +0000
+++ b/src/character.c 2012-06-16 12:24:15 +0000
@@ -57,9 +57,6 @@
Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */
Lisp_Object Vchar_unify_table;
-/* Variable used locally in the macro FETCH_MULTIBYTE_CHAR. */
-unsigned char *_fetch_multibyte_char_p;
-
static Lisp_Object Qchar_script_table;
=== modified file 'src/cmds.c'
--- a/src/cmds.c 2012-02-10 18:58:48 +0000
+++ b/src/cmds.c 2012-06-16 12:24:15 +0000
@@ -22,8 +22,8 @@
#include <setjmp.h>
#include "lisp.h"
#include "commands.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "syntax.h"
#include "window.h"
#include "keyboard.h"
=== modified file 'src/coding.c'
--- a/src/coding.c 2012-05-26 22:27:21 +0000
+++ b/src/coding.c 2012-06-16 12:24:15 +0000
@@ -288,8 +288,8 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "ccl.h"
#include "composite.h"
=== modified file 'src/composite.c'
--- a/src/composite.c 2012-04-09 22:54:59 +0000
+++ b/src/composite.c 2012-06-16 12:24:15 +0000
@@ -25,8 +25,8 @@
#include <config.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "coding.h"
#include "intervals.h"
#include "window.h"
=== modified file 'src/dired.c'
--- a/src/dired.c 2012-04-22 00:53:32 +0000
+++ b/src/dired.c 2012-06-16 12:24:15 +0000
@@ -71,9 +71,9 @@
#include "lisp.h"
#include "systime.h"
+#include "character.h"
#include "buffer.h"
#include "commands.h"
-#include "character.h"
#include "charset.h"
#include "coding.h"
#include "regex.h"
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-06-08 13:59:28 +0000
+++ b/src/dispnew.c 2012-06-16 12:24:15 +0000
@@ -30,8 +30,8 @@
/* cm.h must come after dispextern.h on Windows. */
#include "dispextern.h"
#include "cm.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "keyboard.h"
#include "frame.h"
#include "termhooks.h"
=== modified file 'src/doc.c'
--- a/src/doc.c 2012-05-31 06:06:42 +0000
+++ b/src/doc.c 2012-06-16 12:24:15 +0000
@@ -28,9 +28,9 @@
#include <unistd.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "keyboard.h"
-#include "character.h"
#include "keymap.h"
#include "buildobj.h"
=== modified file 'src/dosfns.c'
--- a/src/dosfns.c 2012-04-09 13:05:48 +0000
+++ b/src/dosfns.c 2012-06-16 12:24:15 +0000
@@ -26,6 +26,7 @@
#include <dos.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "termchar.h"
#include "frame.h"
@@ -35,7 +36,6 @@
#include "dosfns.h"
#include "msdos.h"
#include "dispextern.h"
-#include "character.h"
#include "coding.h"
#include "process.h"
#include <dpmi.h>
=== modified file 'src/editfns.c'
--- a/src/editfns.c 2012-05-25 19:24:54 +0000
+++ b/src/editfns.c 2012-06-16 12:24:15 +0000
@@ -52,8 +52,8 @@
#include <verify.h>
#include "intervals.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "coding.h"
#include "frame.h"
#include "window.h"
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2012-06-13 13:40:48 +0000
+++ b/src/emacs.c 2012-06-16 12:24:15 +0000
@@ -45,6 +45,7 @@
#include "commands.h"
#include "intervals.h"
+#include "character.h"
#include "buffer.h"
#include "window.h"
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2012-06-01 03:41:03 +0000
+++ b/src/fileio.c 2012-06-16 12:24:15 +0000
@@ -40,8 +40,8 @@
#include "lisp.h"
#include "intervals.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "coding.h"
#include "window.h"
#include "blockinput.h"
=== modified file 'src/filelock.c'
--- a/src/filelock.c 2012-05-10 00:55:57 +0000
+++ b/src/filelock.c 2012-06-16 12:24:15 +0000
@@ -40,8 +40,8 @@
#include <errno.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "coding.h"
#include "systime.h"
=== modified file 'src/font.c'
--- a/src/font.c 2012-02-10 18:58:48 +0000
+++ b/src/font.c 2012-06-16 12:24:15 +0000
@@ -27,12 +27,12 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "frame.h"
#include "window.h"
#include "dispextern.h"
#include "charset.h"
-#include "character.h"
#include "composite.h"
#include "fontset.h"
#include "font.h"
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2012-04-09 22:54:59 +0000
+++ b/src/fontset.c 2012-06-16 12:24:15 +0000
@@ -32,8 +32,8 @@
#include "lisp.h"
#include "blockinput.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "ccl.h"
#include "keyboard.h"
=== modified file 'src/fringe.c'
--- a/src/fringe.c 2012-06-09 07:27:15 +0000
+++ b/src/fringe.c 2012-06-16 12:24:15 +0000
@@ -24,6 +24,7 @@
#include "frame.h"
#include "window.h"
#include "dispextern.h"
+#include "character.h"
#include "buffer.h"
#include "blockinput.h"
#include "termhooks.h"
=== modified file 'src/indent.c'
--- a/src/indent.c 2012-04-22 00:53:32 +0000
+++ b/src/indent.c 2012-06-16 12:24:15 +0000
@@ -22,8 +22,8 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "category.h"
#include "composite.h"
#include "indent.h"
=== modified file 'src/insdel.c'
--- a/src/insdel.c 2012-05-25 18:19:24 +0000
+++ b/src/insdel.c 2012-06-16 12:24:15 +0000
@@ -25,8 +25,8 @@
#include "lisp.h"
#include "intervals.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "window.h"
#include "blockinput.h"
#include "region-cache.h"
=== modified file 'src/intervals.c'
--- a/src/intervals.c 2012-05-25 18:19:24 +0000
+++ b/src/intervals.c 2012-06-16 12:24:15 +0000
@@ -42,6 +42,7 @@
#include <intprops.h>
#include "lisp.h"
#include "intervals.h"
+#include "character.h"
#include "buffer.h"
#include "puresize.h"
#include "keyboard.h"
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2012-06-02 19:21:34 +0000
+++ b/src/keyboard.c 2012-06-16 12:24:15 +0000
@@ -30,8 +30,8 @@
#include "keyboard.h"
#include "window.h"
#include "commands.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "disptab.h"
#include "dispextern.h"
#include "syntax.h"
=== modified file 'src/keymap.c'
--- a/src/keymap.c 2012-05-31 06:06:42 +0000
+++ b/src/keymap.c 2012-06-16 12:24:15 +0000
@@ -43,8 +43,8 @@
#include <setjmp.h>
#include "lisp.h"
#include "commands.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "keyboard.h"
#include "frame.h"
=== modified file 'src/lread.c'
--- a/src/lread.c 2012-06-11 15:13:27 +0000
+++ b/src/lread.c 2012-06-16 12:24:15 +0000
@@ -28,8 +28,8 @@
#include <setjmp.h>
#include "lisp.h"
#include "intervals.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "coding.h"
#include <epaths.h>
=== modified file 'src/macros.c'
--- a/src/macros.c 2012-06-02 19:21:34 +0000
+++ b/src/macros.c 2012-06-16 12:24:15 +0000
@@ -23,6 +23,7 @@
#include "lisp.h"
#include "macros.h"
#include "commands.h"
+#include "character.h"
#include "buffer.h"
#include "window.h"
#include "keyboard.h"
=== modified file 'src/marker.c'
--- a/src/marker.c 2012-02-10 18:58:48 +0000
+++ b/src/marker.c 2012-06-16 12:24:15 +0000
@@ -20,8 +20,8 @@
#include <config.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
/* Record one cached position found recently by
buf_charpos_to_bytepos or buf_bytepos_to_charpos. */
=== modified file 'src/minibuf.c'
--- a/src/minibuf.c 2012-06-02 17:03:49 +0000
+++ b/src/minibuf.c 2012-06-16 12:24:15 +0000
@@ -25,6 +25,7 @@
#include "lisp.h"
#include "commands.h"
+#include "character.h"
#include "buffer.h"
#include "dispextern.h"
#include "keyboard.h"
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2012-02-10 18:58:48 +0000
+++ b/src/nsfns.m 2012-06-16 12:24:15 +0000
@@ -38,11 +38,11 @@
#include "blockinput.h"
#include "nsterm.h"
#include "window.h"
+#include "character.h"
#include "buffer.h"
#include "keyboard.h"
#include "termhooks.h"
#include "fontset.h"
-#include "character.h"
#include "font.h"
#if 0
=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m 2012-02-10 18:58:48 +0000
+++ b/src/nsmenu.m 2012-06-16 12:24:15 +0000
@@ -28,6 +28,7 @@
#include "lisp.h"
#include "window.h"
+#include "character.h"
#include "buffer.h"
#include "keymap.h"
#include "coding.h"
=== modified file 'src/print.c'
--- a/src/print.c 2012-05-26 15:52:27 +0000
+++ b/src/print.c 2012-06-16 12:24:15 +0000
@@ -23,8 +23,8 @@
#include <stdio.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "keyboard.h"
#include "frame.h"
=== modified file 'src/process.c'
--- a/src/process.c 2012-04-22 04:48:13 +0000
+++ b/src/process.c 2012-06-16 12:24:15 +0000
@@ -93,8 +93,8 @@
#include "systty.h"
#include "window.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "coding.h"
#include "process.h"
#include "frame.h"
=== modified file 'src/regex.c'
--- a/src/regex.c 2012-06-10 08:39:19 +0000
+++ b/src/regex.c 2012-06-16 12:24:15 +0000
@@ -130,13 +130,13 @@
# include <setjmp.h>
# include "lisp.h"
+# include "character.h"
# include "buffer.h"
/* Make syntax table lookup grant data in gl_state. */
# define SYNTAX_ENTRY_VIA_PROPERTY
# include "syntax.h"
-# include "character.h"
# include "category.h"
# ifdef malloc
=== modified file 'src/region-cache.c'
--- a/src/region-cache.c 2012-01-19 07:21:25 +0000
+++ b/src/region-cache.c 2012-06-16 12:24:15 +0000
@@ -24,6 +24,7 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "region-cache.h"
=== modified file 'src/search.c'
--- a/src/search.c 2012-05-31 06:06:42 +0000
+++ b/src/search.c 2012-06-16 12:24:15 +0000
@@ -24,8 +24,8 @@
#include "lisp.h"
#include "syntax.h"
#include "category.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "region-cache.h"
#include "commands.h"
=== modified file 'src/syntax.c'
--- a/src/syntax.c 2012-04-09 22:54:59 +0000
+++ b/src/syntax.c 2012-06-16 12:24:15 +0000
@@ -25,8 +25,8 @@
#include <setjmp.h>
#include "lisp.h"
#include "commands.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "keymap.h"
#include "regex.h"
=== modified file 'src/term.c'
--- a/src/term.c 2012-06-09 16:44:44 +0000
+++ b/src/term.c 2012-06-16 12:24:15 +0000
@@ -32,8 +32,8 @@
#include "termchar.h"
#include "termopts.h"
#include "tparam.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "coding.h"
#include "composite.h"
=== modified file 'src/textprop.c'
--- a/src/textprop.c 2012-05-25 18:19:24 +0000
+++ b/src/textprop.c 2012-06-16 12:24:15 +0000
@@ -20,6 +20,7 @@
#include <setjmp.h>
#include "lisp.h"
#include "intervals.h"
+#include "character.h"
#include "buffer.h"
#include "window.h"
=== modified file 'src/undo.c'
--- a/src/undo.c 2012-05-25 18:19:24 +0000
+++ b/src/undo.c 2012-06-16 12:24:15 +0000
@@ -20,6 +20,7 @@
#include <config.h>
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "commands.h"
#include "window.h"
=== modified file 'src/unexsol.c'
--- a/src/unexsol.c 2011-03-17 18:41:30 +0000
+++ b/src/unexsol.c 2012-06-16 12:24:15 +0000
@@ -7,6 +7,7 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "charset.h"
#include "coding.h"
=== modified file 'src/w16select.c'
--- a/src/w16select.c 2012-02-11 09:38:41 +0000
+++ b/src/w16select.c 2012-06-16 12:24:15 +0000
@@ -36,8 +36,8 @@
#include "dispextern.h" /* frame.h seems to want this */
#include "frame.h" /* Need this to get the X window of selected_frame */
#include "blockinput.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "coding.h"
#include "composite.h"
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2012-06-13 13:40:48 +0000
+++ b/src/w32fns.c 2012-06-16 12:24:15 +0000
@@ -32,13 +32,13 @@
#include "w32term.h"
#include "frame.h"
#include "window.h"
+#include "character.h"
#include "buffer.h"
#include "intervals.h"
#include "dispextern.h"
#include "keyboard.h"
#include "blockinput.h"
#include "epaths.h"
-#include "character.h"
#include "charset.h"
#include "coding.h"
#include "ccl.h"
=== modified file 'src/w32menu.c'
--- a/src/w32menu.c 2012-06-13 13:40:48 +0000
+++ b/src/w32menu.c 2012-06-16 12:24:15 +0000
@@ -31,6 +31,7 @@
#include "termhooks.h"
#include "window.h"
#include "blockinput.h"
+#include "character.h"
#include "buffer.h"
#include "charset.h"
#include "coding.h"
=== modified file 'src/window.c'
--- a/src/window.c 2012-06-16 07:18:44 +0000
+++ b/src/window.c 2012-06-16 12:24:15 +0000
@@ -23,6 +23,7 @@
#include <setjmp.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
#include "keyboard.h"
#include "keymap.h"
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-06-16 11:47:44 +0000
+++ b/src/xdisp.c 2012-06-16 12:24:15 +0000
@@ -281,8 +281,8 @@
#include "window.h"
#include "termchar.h"
#include "dispextern.h"
+#include "character.h"
#include "buffer.h"
-#include "character.h"
#include "charset.h"
#include "indent.h"
#include "commands.h"
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2012-06-01 20:49:03 +0000
+++ b/src/xfns.c 2012-06-16 12:24:15 +0000
@@ -32,13 +32,13 @@
#include "xterm.h"
#include "frame.h"
#include "window.h"
+#include "character.h"
#include "buffer.h"
#include "intervals.h"
#include "dispextern.h"
#include "keyboard.h"
#include "blockinput.h"
#include <epaths.h>
-#include "character.h"
#include "charset.h"
#include "coding.h"
#include "fontset.h"
=== modified file 'src/xmenu.c'
--- a/src/xmenu.c 2012-02-10 18:58:48 +0000
+++ b/src/xmenu.c 2012-06-16 12:24:15 +0000
@@ -47,6 +47,7 @@
#include "termhooks.h"
#include "window.h"
#include "blockinput.h"
+#include "character.h"
#include "buffer.h"
#include "charset.h"
#include "coding.h"
=== modified file 'src/xml.c'
--- a/src/xml.c 2012-04-09 22:54:59 +0000
+++ b/src/xml.c 2012-06-16 12:24:15 +0000
@@ -26,6 +26,7 @@
#include <libxml/HTMLparser.h>
#include "lisp.h"
+#include "character.h"
#include "buffer.h"
=== modified file 'src/xselect.c'
--- a/src/xselect.c 2012-05-25 18:19:24 +0000
+++ b/src/xselect.c 2012-06-16 12:24:15 +0000
@@ -35,11 +35,11 @@
#include "dispextern.h" /* frame.h seems to want this */
#include "frame.h" /* Need this to get the X window of selected_frame */
#include "blockinput.h"
+#include "character.h"
#include "buffer.h"
#include "process.h"
#include "termhooks.h"
#include "keyboard.h"
-#include "character.h"
#include <X11/Xproto.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108627: * buffer.h (FETCH_MULTIBYTE_CHAR): Define as inline.,
Andreas Schwab <=