mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-26 10:49:33 +00:00
* xfaces.c (syms_of_xfaces): Delete stray semicolon.
* xdisp.c (next_element_from_buffer): * window.c (delete_window): * term.c (term_mouse_highlight): * msdos.c (getdefdir): * macterm.c (mac_create_bitmap_from_bitmap_data) (init_font_name_table): * fns.c (Fsxhash): * data.c (Fmake_local_variable): * ccl.c (ccl_driver): Likewise.
This commit is contained in:
parent
54c3653855
commit
3b8c0c70a7
@ -1,3 +1,16 @@
|
|||||||
|
2007-05-26 Dan Nicolaescu <dann@ics.uci.edu>
|
||||||
|
|
||||||
|
* xfaces.c (syms_of_xfaces): Delete stray semicolon.
|
||||||
|
* xdisp.c (next_element_from_buffer):
|
||||||
|
* window.c (delete_window):
|
||||||
|
* term.c (term_mouse_highlight):
|
||||||
|
* msdos.c (getdefdir):
|
||||||
|
* macterm.c (mac_create_bitmap_from_bitmap_data)
|
||||||
|
(init_font_name_table):
|
||||||
|
* fns.c (Fsxhash):
|
||||||
|
* data.c (Fmake_local_variable):
|
||||||
|
* ccl.c (ccl_driver): Likewise.
|
||||||
|
|
||||||
2007-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
2007-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||||
|
|
||||||
* macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
|
* macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
|
||||||
|
@ -1261,7 +1261,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
|
|||||||
case CCL_MOD: reg[rrr] = i % j; break;
|
case CCL_MOD: reg[rrr] = i % j; break;
|
||||||
case CCL_AND: reg[rrr] = i & j; break;
|
case CCL_AND: reg[rrr] = i & j; break;
|
||||||
case CCL_OR: reg[rrr] = i | j; break;
|
case CCL_OR: reg[rrr] = i | j; break;
|
||||||
case CCL_XOR: reg[rrr] = i ^ j;; break;
|
case CCL_XOR: reg[rrr] = i ^ j; break;
|
||||||
case CCL_LSH: reg[rrr] = i << j; break;
|
case CCL_LSH: reg[rrr] = i << j; break;
|
||||||
case CCL_RSH: reg[rrr] = i >> j; break;
|
case CCL_RSH: reg[rrr] = i >> j; break;
|
||||||
case CCL_LSH8: reg[rrr] = (i << 8) | j; break;
|
case CCL_LSH8: reg[rrr] = (i << 8) | j; break;
|
||||||
|
@ -1575,7 +1575,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */)
|
|||||||
XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0;
|
XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0;
|
||||||
XBUFFER_LOCAL_VALUE (newval)->check_frame = 0;
|
XBUFFER_LOCAL_VALUE (newval)->check_frame = 0;
|
||||||
XBUFFER_LOCAL_VALUE (newval)->cdr = tem;
|
XBUFFER_LOCAL_VALUE (newval)->cdr = tem;
|
||||||
SET_SYMBOL_VALUE (variable, newval);;
|
SET_SYMBOL_VALUE (variable, newval);
|
||||||
}
|
}
|
||||||
/* Make sure this buffer has its own value of symbol. */
|
/* Make sure this buffer has its own value of symbol. */
|
||||||
tem = Fassq (variable, current_buffer->local_var_alist);
|
tem = Fassq (variable, current_buffer->local_var_alist);
|
||||||
|
@ -5212,7 +5212,7 @@ DEFUN ("sxhash", Fsxhash, Ssxhash, 1, 1, 0,
|
|||||||
(obj)
|
(obj)
|
||||||
Lisp_Object obj;
|
Lisp_Object obj;
|
||||||
{
|
{
|
||||||
unsigned hash = sxhash (obj, 0);;
|
unsigned hash = sxhash (obj, 0);
|
||||||
return make_number (hash);
|
return make_number (hash);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -734,7 +734,7 @@ mac_create_bitmap_from_bitmap_data (bitmap, bits, w, h)
|
|||||||
/* Bitswap XBM bytes to match how Mac does things. */
|
/* Bitswap XBM bytes to match how Mac does things. */
|
||||||
unsigned char c = *bits++;
|
unsigned char c = *bits++;
|
||||||
*p++ = (unsigned char)((swap_nibble[c & 0xf] << 4)
|
*p++ = (unsigned char)((swap_nibble[c & 0xf] << 4)
|
||||||
| (swap_nibble[(c>>4) & 0xf]));;
|
| (swap_nibble[(c>>4) & 0xf]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -7558,7 +7558,7 @@ init_font_name_table ()
|
|||||||
make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE),
|
make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE),
|
||||||
make_float (DEFAULT_REHASH_SIZE),
|
make_float (DEFAULT_REHASH_SIZE),
|
||||||
make_float (DEFAULT_REHASH_THRESHOLD),
|
make_float (DEFAULT_REHASH_THRESHOLD),
|
||||||
Qnil, Qnil, Qnil);;
|
Qnil, Qnil, Qnil);
|
||||||
h = XHASH_TABLE (atsu_font_id_hash);
|
h = XHASH_TABLE (atsu_font_id_hash);
|
||||||
|
|
||||||
err = ATSUFontCount (&nfonts);
|
err = ATSUFontCount (&nfonts);
|
||||||
|
@ -1584,7 +1584,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y)
|
|||||||
{
|
{
|
||||||
extern Lisp_Object Qmouse_face;
|
extern Lisp_Object Qmouse_face;
|
||||||
Lisp_Object mouse_face, overlay, position, *overlay_vec;
|
Lisp_Object mouse_face, overlay, position, *overlay_vec;
|
||||||
int noverlays, obegv, ozv;;
|
int noverlays, obegv, ozv;
|
||||||
struct buffer *obuf;
|
struct buffer *obuf;
|
||||||
|
|
||||||
/* If we get an out-of-range value, return now; avoid an error. */
|
/* If we get an out-of-range value, return now; avoid an error. */
|
||||||
@ -4071,7 +4071,7 @@ getdefdir (drive, dst)
|
|||||||
int drive;
|
int drive;
|
||||||
char *dst;
|
char *dst;
|
||||||
{
|
{
|
||||||
char in_path[4], *p = in_path, e = errno;;
|
char in_path[4], *p = in_path, e = errno;
|
||||||
|
|
||||||
/* Generate "X:." (when drive is X) or "." (when drive is 0). */
|
/* Generate "X:." (when drive is X) or "." (when drive is 0). */
|
||||||
if (drive != 0)
|
if (drive != 0)
|
||||||
|
@ -2625,7 +2625,7 @@ term_mouse_highlight (struct frame *f, int x, int y)
|
|||||||
{
|
{
|
||||||
extern Lisp_Object Qmouse_face;
|
extern Lisp_Object Qmouse_face;
|
||||||
Lisp_Object mouse_face, overlay, position, *overlay_vec;
|
Lisp_Object mouse_face, overlay, position, *overlay_vec;
|
||||||
int noverlays, obegv, ozv;;
|
int noverlays, obegv, ozv;
|
||||||
struct buffer *obuf;
|
struct buffer *obuf;
|
||||||
|
|
||||||
/* If we get an out-of-range value, return now; avoid an error. */
|
/* If we get an out-of-range value, return now; avoid an error. */
|
||||||
|
@ -1532,7 +1532,7 @@ delete_window (window)
|
|||||||
if (!EQ (window, pwindow))
|
if (!EQ (window, pwindow))
|
||||||
break;
|
break;
|
||||||
/* Otherwise, try another window for SWINDOW. */
|
/* Otherwise, try another window for SWINDOW. */
|
||||||
swindow = Fnext_window (swindow, Qlambda, Qnil);;
|
swindow = Fnext_window (swindow, Qlambda, Qnil);
|
||||||
|
|
||||||
/* If we get back to the frame's selected window,
|
/* If we get back to the frame's selected window,
|
||||||
it means there was no acceptable alternative,
|
it means there was no acceptable alternative,
|
||||||
|
@ -6269,7 +6269,7 @@ next_element_from_buffer (it)
|
|||||||
it->c = *p, it->len = 1;
|
it->c = *p, it->len = 1;
|
||||||
|
|
||||||
/* Record what we have and where it came from. */
|
/* Record what we have and where it came from. */
|
||||||
it->what = IT_CHARACTER;;
|
it->what = IT_CHARACTER;
|
||||||
it->object = it->w->buffer;
|
it->object = it->w->buffer;
|
||||||
it->position = it->current.pos;
|
it->position = it->current.pos;
|
||||||
|
|
||||||
|
@ -7987,7 +7987,7 @@ syms_of_xfaces ()
|
|||||||
staticpro (&QCforeground);
|
staticpro (&QCforeground);
|
||||||
QCbackground = intern (":background");
|
QCbackground = intern (":background");
|
||||||
staticpro (&QCbackground);
|
staticpro (&QCbackground);
|
||||||
QCstipple = intern (":stipple");;
|
QCstipple = intern (":stipple");
|
||||||
staticpro (&QCstipple);
|
staticpro (&QCstipple);
|
||||||
QCwidth = intern (":width");
|
QCwidth = intern (":width");
|
||||||
staticpro (&QCwidth);
|
staticpro (&QCwidth);
|
||||||
|
Loading…
Reference in New Issue
Block a user