Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
bb16bffb
Commit
bb16bffb
authored
Jul 20, 2014
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Indentation, punctuation, and other nitpicks.
parent
5bfcb88c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
19 deletions
+21
-19
lisp/emacs-lisp/cl-macs.el
lisp/emacs-lisp/cl-macs.el
+2
-1
lisp/net/rcirc.el
lisp/net/rcirc.el
+2
-1
lisp/progmodes/sh-script.el
lisp/progmodes/sh-script.el
+2
-2
src/term.c
src/term.c
+9
-9
src/terminal.c
src/terminal.c
+6
-6
No files found.
lisp/emacs-lisp/cl-macs.el
View file @
bb16bffb
...
...
@@ -2514,7 +2514,8 @@ non-nil value, that slot cannot be set via `setf'.
',accessor
',name
))))
,
(
if
(
eq
type
'vector
)
`
(
aref
cl-x
,
pos
)
(
if
(
=
pos
0
)
'
(
car
cl-x
)
`
(
nth
,
pos
cl-x
))))
forms
)
`
(
nth
,
pos
cl-x
))))
forms
)
(
push
(
cons
accessor
t
)
side-eff
)
(
if
(
cadr
(
memq
:read-only
(
cddr
desc
)))
(
push
`
(
gv-define-expander
,
accessor
...
...
lisp/net/rcirc.el
View file @
bb16bffb
...
...
@@ -679,7 +679,8 @@ When 0, do not auto-reconnect."
(
format
"%s: %s (%S)"
(
process-name
process
)
sentinel
(
process-status
process
))
(
not
rcirc-target
))
(
process-status
process
))
(
not
rcirc-target
))
(
rcirc-disconnect-buffer
)))
(
when
(
and
(
string=
sentinel
"deleted"
)
(
<
0
rcirc-reconnect-delay
))
...
...
lisp/progmodes/sh-script.el
View file @
bb16bffb
...
...
@@ -910,7 +910,7 @@ See `sh-feature'.")
(
:foreground
"tan1"
))
(
t
(
:weight
bold
)))
"Face to show a here-document"
"Face to show a here-document
.
"
:group
'sh-indentation
)
;; These colors are probably icky. It's just a placeholder though.
...
...
@@ -921,7 +921,7 @@ See `sh-feature'.")
(
:foreground
"magenta"
))
(
t
(
:weight
bold
)))
"Face to show quoted execs like `
`
"
"Face to show quoted execs like `
blabla`.
"
:group
'sh-indentation
)
(
define-obsolete-face-alias
'sh-heredoc-face
'sh-heredoc
"22.1"
)
(
defvar
sh-heredoc-face
'sh-heredoc
)
...
...
src/term.c
View file @
bb16bffb
...
...
@@ -105,9 +105,9 @@ static _Noreturn void vfatal (const char *str, va_list ap)
#define OUTPUT1_IF(tty, a) do { if (a) emacs_tputs ((tty), a, 1, cmputc); } while (0)
/* Display space properties */
/* Display space properties
.
*/
/* Chain of all tty device parameters. */
/* Chain of all tty device parameters.
*/
struct
tty_display_info
*
tty_list
;
/* Meaning of bits in no_color_video. Each bit set means that the
...
...
@@ -4042,10 +4042,10 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed)
open a frame on the same terminal. */
int
flags
=
O_RDWR
|
O_NOCTTY
|
(
ctty
?
0
:
O_IGNORE_CTTY
);
int
fd
=
emacs_open
(
name
,
flags
,
0
);
tty
->
input
=
tty
->
output
=
((
fd
<
0
||
!
isatty
(
fd
))
?
NULL
:
fdopen
(
fd
,
"w+"
));
tty
->
input
=
tty
->
output
=
((
fd
<
0
||
!
isatty
(
fd
))
?
NULL
:
fdopen
(
fd
,
"w+"
));
if
(
!
tty
->
input
)
{
...
...
@@ -4460,7 +4460,7 @@ fatal (const char *str, ...)
/* Delete the given tty terminal, closing all frames on it. */
/* Delete the given tty terminal, closing all frames on it.
*/
static
void
delete_tty
(
struct
terminal
*
terminal
)
...
...
@@ -4485,7 +4485,7 @@ delete_tty (struct terminal *terminal)
;
if
(
!
p
)
/* This should not happen. */
/* This should not happen.
*/
emacs_abort
();
p
->
next
=
tty
->
next
;
...
...
@@ -4493,7 +4493,7 @@ delete_tty (struct terminal *terminal)
}
/* reset_sys_modes needs a valid device, so this call needs to be
before delete_terminal. */
before delete_terminal.
*/
reset_sys_modes
(
tty
);
delete_terminal
(
terminal
);
...
...
src/terminal.c
View file @
bb16bffb
...
...
@@ -28,13 +28,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "coding.h"
#include "keyboard.h"
/* Chain of all terminals currently in use. */
/* Chain of all terminals currently in use.
*/
struct
terminal
*
terminal_list
;
/* The first unallocated terminal id. */
/* The first unallocated terminal id.
*/
static
int
next_terminal_id
;
/* The initial terminal device, created by initial_term_init. */
/* The initial terminal device, created by initial_term_init.
*/
struct
terminal
*
initial_terminal
;
static
Lisp_Object
Qterminal_live_p
;
...
...
@@ -121,9 +121,9 @@ raw_cursor_to (struct frame *f, int row, int col)
(
*
FRAME_TERMINAL
(
f
)
->
raw_cursor_to_hook
)
(
f
,
row
,
col
);
}
/* Erase operations */
/* Erase operations
.
*/
/* Clear from cursor to end of frame. */
/* Clear from cursor to end of frame.
*/
void
clear_to_end
(
struct
frame
*
f
)
{
...
...
@@ -131,7 +131,7 @@ clear_to_end (struct frame *f)
(
*
FRAME_TERMINAL
(
f
)
->
clear_to_end_hook
)
(
f
);
}
/* Clear entire frame */
/* Clear entire frame
.
*/
void
clear_frame
(
struct
frame
*
f
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment