GNU bug report logs - #25339
[PATCH] Remove local variables only used as front ends to others.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 25339 in the body.
You can then email your comments to 25339 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Chris Gregory <czipperz <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: [PATCH] Remove local variables only used as front ends to others.
Date: Mon, 02 Jan 2017 14:37:53 -0800

-- 
Chris Gregory

diff --git a/src/term.c b/src/term.c
index c067a86d18..d70e2bc9d7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4161,12 +4161,10 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
 #ifdef WINDOWSNT
   {
     struct frame *f = XFRAME (selected_frame);
-    int height, width;
-
-    initialize_w32_display (terminal, &width, &height);
+    int height;
 
+    initialize_w32_display (terminal, &FrameCols (tty), &height);
     FrameRows (tty) = height;
-    FrameCols (tty) = width;
     tty->specified_window = height;
 
     FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
@@ -4176,14 +4174,11 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
   }
 #else  /* MSDOS */
   {
-    int height, width;
     if (strcmp (terminal_type, "internal") == 0)
       terminal->type = output_msdos_raw;
     initialize_msdos_display (terminal);
 
-    get_tty_size (fileno (tty->input), &width, &height);
-    FrameCols (tty) = width;
-    FrameRows (tty) = height;
+    get_tty_size (fileno (tty->input), &FrameCols (tty), &FrameRows (tty));
     tty->char_ins_del_ok = 0;
     init_baud_rate (fileno (tty->input));
   }
@@ -4229,12 +4224,7 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
   term_get_fkeys (address, terminal->kboard);
 
   /* Get frame size from system, or else from termcap.  */
-  {
-    int height, width;
-    get_tty_size (fileno (tty->input), &width, &height);
-    FrameCols (tty) = width;
-    FrameRows (tty) = height;
-  }
+  get_tty_size (fileno (tty->input), &FrameCols (tty), &FrameRows (tty));
 
   if (FrameCols (tty) <= 0)
     FrameCols (tty) = tgetnum ("co");

Message #12 received at 25339 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Chris Gregory <czipperz <at> gmail.com>
Cc: 25339 <at> debbugs.gnu.org
Subject: Re: bug#25339: [PATCH] Remove local variables only used as front ends
 to others.
Date: Sat, 07 Jan 2017 10:22:02 +0200

tags 25339 notabug
close 25339
thanks

> From: Chris Gregory <czipperz <at> gmail.com>
> Date: Mon, 02 Jan 2017 14:37:53 -0800
> 
> diff --git a/src/term.c b/src/term.c
> index c067a86d18..d70e2bc9d7 100644
> --- a/src/term.c
> +++ b/src/term.c
> @@ -4161,12 +4161,10 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
>  #ifdef WINDOWSNT
>    {
>      struct frame *f = XFRAME (selected_frame);
> -    int height, width;
> -
> -    initialize_w32_display (terminal, &width, &height);
> +    int height;
>  
> +    initialize_w32_display (terminal, &FrameCols (tty), &height);

Thanks, but I consider these changes not to be for the better.  E.g.,
FrameCols could be a macro (and it actually is in the non-WINDOWSNT
case).  Also, the original code looks more natural to me.

So I don't think we should install these changes.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.