mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-05 20:43:08 +00:00
Code Issues Releases Activity

* xterm.c (x_new_font):

Browse Source 
* print.c (print_object):
* cmds.c (Fself_insert_command): Move declarations before statements.
This commit is contained in:
Dan Nicolaescu 2009-11-21 02:33:45 +00:00
parent e572025ff1
commit b0ca0f33f7
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-21 Dan Nicolaescu <dann@ics.uci.edu>
* xterm.c (x_new_font):
* print.c (print_object):
* cmds.c (Fself_insert_command): Move declarations before statements.
2009-11-20 Ken Brown <kbrown@cornell.edu> (tiny change)
* s/cygwin.h: Remove unneeded linker flags.

2
src/cmds.c
View File

@ -330,8 +330,8 @@ After insertion, the value of `auto-fill-function' is called if the
(n)
Lisp_Object n;
{
CHECK_NUMBER (n);
int remove_boundary = 1;
CHECK_NUMBER (n);
if (!EQ (Vthis_command, current_kboard->Vlast_command))
nonundocount = 0;

7
src/print.c
View File

@ -2034,6 +2034,7 @@ print_object (obj, printcharfun, escapeflag)
else if (HASH_TABLE_P (obj))
{
struct Lisp_Hash_Table *h = XHASH_TABLE (obj);
int i, real_size, size;
#if 0
strout ("#<hash-table", -1, -1, printcharfun, 0);
if (SYMBOLP (h->test))
@ -2086,10 +2087,8 @@ print_object (obj, printcharfun, escapeflag)
strout (" data ", -1, -1, printcharfun, 0);
/* Print the data here as a plist. */
int i;
int real_size = HASH_TABLE_SIZE (h);
int size = real_size;
real_size = HASH_TABLE_SIZE (h);
size = real_size;
/* Don't print more elements than the specified maximum. */
if (NATNUMP (Vprint_length)

8
src/xterm.c
View File

@ -8054,7 +8054,9 @@ x_new_font (f, font_object, fontset)
problems because the tip frame has no widget. */
if (NILP (tip_frame) || XFRAME (tip_frame) != f)
{
/* When the frame is maximized/fullscreen or running under for
int rows, cols;
/* When the frame is maximized/fullscreen or running under for
example Xmonad, x_set_window_size will be a no-op.
In that case, the right thing to do is extend rows/cols to
the current frame size. We do that first if x_set_window_size
@ -8067,8 +8069,8 @@ x_new_font (f, font_object, fontset)
is however. */
pixelh -= FRAME_MENUBAR_HEIGHT (f);
#endif
int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelh);
int cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f));
rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelh);
cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f));
change_frame_size (f, rows, cols, 0, 1, 0);
x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));