[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b76bea4: Various minor details accumulated over tim
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] master b76bea4: Various minor details accumulated over time |
|
Date: |
Mon, 08 Dec 2014 20:02:31 +0000 |
branch: master
commit b76bea4c2639ee78b345d50a0f6ce5d10e2253ac
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
Various minor details accumulated over time
* lisp/info.el (Info-mode-map): Remove left-over binding.
* lisp/net/tramp.el (tramp-handle-make-symbolic-link): Mark unused arg.
* lisp/obsolete/gulp.el (gulp-create-m-p-alist): Remove unused var `mnt-tm'.
* lisp/progmodes/gud.el (gud-gdb-completions): Remove unused var `start'.
* lisp/url/url-http.el (url-http-activate-callback): Make debug more
verbose.
* src/process.c: Whitespace and line-break nitpicks.
---
ChangeLog | 4 +-
lib-src/ChangeLog | 4 +-
lisp/ChangeLog | 8 ++++
lisp/ChangeLog.10 | 2 +-
lisp/Makefile.in | 5 ++
lisp/info.el | 1 -
lisp/net/tramp.el | 2 +-
lisp/obsolete/gulp.el | 2 +-
lisp/progmodes/gud.el | 3 +-
lisp/url/ChangeLog | 8 +++-
lisp/url/url-http.el | 3 +-
src/ChangeLog | 4 ++
src/process.c | 100 ++++++++++++++++++++++++------------------------
13 files changed, 83 insertions(+), 63 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 026ae89..88654dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8692,7 +8692,7 @@
* configure.in (HAVE_XIM): Define if XIM is available.
-2003-07-29 Tim Van Holder <address@hidden> (tiny change)
+2003-07-29 Tim Van Holder <address@hidden>
* configure.in: The function gtk_window_set_icon_from_file was
introduced in GTK+ 2.2, so check for that release.
@@ -8926,7 +8926,7 @@
* configure.in (*-sunos5.8*, *-solaris2.8*): New configurations.
-2002-11-11 Tim Van Holder <address@hidden> (tiny change)
+2002-11-11 Tim Van Holder <address@hidden>
* Makefile.in (install-arch-indep): Prepend $(srcdir)/ to lisp.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5260ed0..ab67538 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -3011,7 +3011,7 @@
filter), show help instead of blindingly dumping every single
ChangeLog available. Doc fix. Update version.
-2006-11-02 Tim Van Holder <address@hidden> (tiny change)
+2006-11-02 Tim Van Holder <address@hidden>
* emacsclient.c [WINDOWSNT]: Define HAVE_INET_SOCKETS.
[!WINDOWSNT]: Include <netinet/in.h> if available.
@@ -3036,7 +3036,7 @@
(set_tcp_socket): Prefer O_NONBLOCK, then O_NDELAY, then FIONBIO
to set the socket in non-blocking mode.
-2006-10-31 Tim Van Holder <address@hidden> (tiny change)
+2006-10-31 Tim Van Holder <address@hidden>
* emacsclient.c [!WINDOWSNT]: Include <netinet/in.h> and <sys/ioctl.h>.
(INVALID_SOCKET): Define.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec0a8c4..62a603b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
2014-12-08 Stefan Monnier <address@hidden>
+ * progmodes/gud.el (gud-gdb-completions): Remove unused var `start'.
+
+ * obsolete/gulp.el (gulp-create-m-p-alist): Remove unused var `mnt-tm'.
+
+ * net/tramp.el (tramp-handle-make-symbolic-link): Mark unused arg.
+
+ * info.el (Info-mode-map): Remove left-over binding.
+
* emacs-lisp/avl-tree.el: Use lexical-binding and cl-lib.
(avl-tree--root): Remove redundant defsetf.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index bcd2dac..6e65e4c 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -8452,7 +8452,7 @@
* vc-sccs.el (vc-sccs-registered): Improve comment.
-2002-11-13 Tim Van Holder <address@hidden> (tiny change)
+2002-11-13 Tim Van Holder <address@hidden>
* progmodes/compile.el (compilation-error-regexp-alist):
Don't include colon and space after a file name as part of the name.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 84d92c2..f22ca69 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -472,6 +472,11 @@ maintainer-clean: distclean bootstrap-clean
check-declare:
$(emacs) -l check-declare --eval '(check-declare-directory "$(lisp)")'
+check-defun-dups:
+ sed -n -e '/^(defun /s/\(.\)(.*/\1/p' \
+ $$(find . -name '*.el' -print | grep -v 'loaddefs\.el') \
+ | sort | uniq -d
+
# Dependencies
## None of the following matters for bootstrap, which is the only way
diff --git a/lisp/info.el b/lisp/info.el
index 2a8ba90..7c4d7f3 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4013,7 +4013,6 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
(define-key map "," 'Info-index-next)
(define-key map "\177" 'Info-scroll-down)
(define-key map [mouse-2] 'Info-mouse-follow-nearest-node)
- (define-key map [down-mouse-2] 'ignore) ;Override potential global binding.
(define-key map [follow-link] 'mouse-face)
(define-key map [XF86Back] 'Info-history-back)
(define-key map [XF86Forward] 'Info-history-forward)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index fc9950d..2cf9d45 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3226,7 +3226,7 @@ User is always nil."
t)))
(defun tramp-handle-make-symbolic-link
- (filename linkname &optional ok-if-already-exists)
+ (filename linkname &optional _ok-if-already-exists)
"Like `make-symbolic-link' for Tramp files."
(with-parsed-tramp-file-name
(if (tramp-tramp-file-p filename) filename linkname) nil
diff --git a/lisp/obsolete/gulp.el b/lisp/obsolete/gulp.el
index 00cb896..66394b4 100644
--- a/lisp/obsolete/gulp.el
+++ b/lisp/obsolete/gulp.el
@@ -137,7 +137,7 @@ is left in the `*gulp*' buffer at the end."
"Create the maintainer/package alist for files in FLIST in DIR.
That is a list of elements, each of the form (MAINTAINER PACKAGES...)."
(save-excursion
- (let (mplist filen node mnt-tm mnt tm fl-tm)
+ (let (mplist filen node mnt tm fl-tm)
(get-buffer-create gulp-tmp-buffer)
(set-buffer gulp-tmp-buffer)
(setq buffer-undo-list t)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 24d5469..a12bdd9 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -803,8 +803,7 @@ directory and source-file directory for your debugger."
"Completion table for GDB commands.
COMMAND is the prefix for which we seek completion.
CONTEXT is the text before COMMAND on the line."
- (let* ((start (- (point) (field-beginning)))
- (complete-list
+ (let* ((complete-list
(gud-gdb-run-command-fetch-lines (concat "complete " context command)
(current-buffer)
;; From string-match above.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 18fc2a1..b39c67e 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-08 Stefan Monnier <address@hidden>
+
+ * url-http.el (url-http-activate-callback): Make debug more verbose.
+
2014-12-05 Stefan Monnier <address@hidden>
* url-future.el (url-future-done-p, url-future-completed-p)
@@ -21,8 +25,8 @@
2014-11-05 Teodor Zlatanov <address@hidden>
* url-http.el (url-user-agent): New variable, can be function or
- string. Suggested by Vibhav Pant <address@hidden>. Add
- :version. (Bug#16498)
+ string. Suggested by Vibhav Pant <address@hidden>.
+ Add :version. (Bug#16498)
(url-http-user-agent-string): Use it.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 1001c4d..3d5b6be 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -892,7 +892,8 @@ should be shown to the user."
(url-http-mark-connection-as-free (url-host url-current-object)
(url-port url-current-object)
url-http-process)
- (url-http-debug "Activating callback in buffer (%s)" (buffer-name))
+ (url-http-debug "Activating callback in buffer (%s): %S %S"
+ (buffer-name) url-callback-function url-callback-arguments)
(apply url-callback-function url-callback-arguments))
;; )
diff --git a/src/ChangeLog b/src/ChangeLog
index 314c653..6aec429 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-08 Stefan Monnier <address@hidden>
+
+ * process.c: Whitespace and line-break nitpicks.
+
2014-12-08 Lars Magne Ingebrigtsen <address@hidden>
* gnutls.c (gnutls_certificate_details): The :signature isn't
diff --git a/src/process.c b/src/process.c
index 6eae516..7283df4 100644
--- a/src/process.c
+++ b/src/process.c
@@ -326,10 +326,10 @@ static int max_process_desc;
/* The largest descriptor currently in use for input; -1 if none. */
static int max_input_desc;
-/* Indexed by descriptor, gives the process (if any) for that descriptor */
+/* Indexed by descriptor, gives the process (if any) for that descriptor. */
static Lisp_Object chan_process[FD_SETSIZE];
-/* Alist of elements (NAME . PROCESS) */
+/* Alist of elements (NAME . PROCESS). */
static Lisp_Object Vprocess_alist;
/* Buffered-ahead input char from process, indexed by channel.
@@ -456,7 +456,7 @@ static struct fd_callback_data
void *data;
#define FOR_READ 1
#define FOR_WRITE 2
- int condition; /* mask of the defines above. */
+ int condition; /* Mask of the defines above. */
} fd_callback_info[FD_SETSIZE];
@@ -691,8 +691,8 @@ allocate_pty (char pty_name[PTY_NAME_SIZE])
have a race condition between the PTY_OPEN and here. */
fcntl (fd, F_SETFD, FD_CLOEXEC);
#endif
- /* check to make certain that both sides are available
- this avoids a nasty yet stupid bug in rlogins */
+ /* Check to make certain that both sides are available
+ this avoids a nasty yet stupid bug in rlogins. */
#ifdef PTY_TTY_NAME_SPRINTF
PTY_TTY_NAME_SPRINTF
#else
@@ -1343,7 +1343,7 @@ Returns nil if format of ADDRESS is invalid. */)
&& XINT (p->contents[i]) > 255)
return Qnil;
- args[i+1] = p->contents[i];
+ args[i + 1] = p->contents[i];
}
return Fformat (nargs + 1, args);
@@ -1723,7 +1723,7 @@ create_process (Lisp_Object process, char **new_argv,
Lisp_Object current_dir)
if (inchannel > max_process_desc)
max_process_desc = inchannel;
- /* This may signal an error. */
+ /* This may signal an error. */
setup_process_coding_systems (process);
block_input ();
@@ -1996,7 +1996,7 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, int len)
{
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
uint16_t *ip6 = (uint16_t *) &sin6->sin6_addr;
- len = sizeof (sin6->sin6_addr)/2 + 1;
+ len = sizeof (sin6->sin6_addr) / 2 + 1;
address = Fmake_vector (make_number (len), Qnil);
p = XVECTOR (address);
p->contents[--len] = make_number (ntohs (sin6->sin6_port));
@@ -2207,14 +2207,14 @@ Returns nil upon error setting address, ADDRESS
otherwise. */)
static const struct socket_options {
/* The name of this option. Should be lowercase version of option
- name without SO_ prefix. */
+ name without SO_ prefix. */
const char *name;
- /* Option level SOL_... */
+ /* Option level SOL_... */
int optlevel;
- /* Option number SO_... */
+ /* Option number SO_... */
int optnum;
enum { SOPT_UNKNOWN, SOPT_BOOL, SOPT_INT, SOPT_IFNAME, SOPT_LINGER } opttype;
- enum { OPIX_NONE=0, OPIX_MISC=1, OPIX_REUSEADDR=2 } optbit;
+ enum { OPIX_NONE = 0, OPIX_MISC = 1, OPIX_REUSEADDR = 2 } optbit;
} socket_options[] =
{
#ifdef SO_BINDTODEVICE
@@ -2290,7 +2290,7 @@ set_socket_option (int s, Lisp_Object opt, Lisp_Object
val)
#ifdef SO_BINDTODEVICE
case SOPT_IFNAME:
{
- char devname[IFNAMSIZ+1];
+ char devname[IFNAMSIZ + 1];
/* This is broken, at least in the Linux 2.4 kernel.
To unbind, the arg must be a zero integer, not the empty string.
@@ -2667,7 +2667,7 @@ usage: (make-serial-process &rest ARGS) */)
exactly like a normal process when reading and writing. Primary
differences are in status display and process deletion. A network
connection has no PID; you cannot signal it. All you can do is
- stop/continue it and deactivate/close it via delete-process */
+ stop/continue it and deactivate/close it via delete-process. */
DEFUN ("make-network-process", Fmake_network_process, Smake_network_process,
0, MANY, 0,
@@ -2871,7 +2871,7 @@ usage: (make-network-process &rest ARGS) */)
GCPRO1 (contact);
#ifdef WINDOWSNT
- /* Ensure socket support is loaded if available. */
+ /* Ensure socket support is loaded if available. */
init_winsock (TRUE);
#endif
@@ -2978,7 +2978,7 @@ usage: (make-network-process &rest ARGS) */)
{
if (EQ (host, Qlocal))
/* Depending on setup, "localhost" may map to different IPv4 and/or
- IPv6 addresses, so it's better to be explicit. (Bug#6781) */
+ IPv6 addresses, so it's better to be explicit (Bug#6781). */
host = build_string ("127.0.0.1");
CHECK_STRING (host);
}
@@ -3110,7 +3110,7 @@ usage: (make-network-process &rest ARGS) */)
address_in.sin_family = family;
}
else
- /* Attempt to interpret host as numeric inet address */
+ /* Attempt to interpret host as numeric inet address. */
{
unsigned long numeric_addr;
numeric_addr = inet_addr (SSDATA (host));
@@ -3176,8 +3176,8 @@ usage: (make-network-process &rest ARGS) */)
/* Parse network options in the arg list.
We simply ignore anything which isn't a known option (including other
keywords).
An error is signaled if setting a known option fails. */
- for (optn = optbits = 0; optn < nargs-1; optn += 2)
- optbits |= set_socket_option (s, args[optn], args[optn+1]);
+ for (optn = optbits = 0; optn < nargs - 1; optn += 2)
+ optbits |= set_socket_option (s, args[optn], args[optn + 1]);
if (is_server)
{
@@ -3248,7 +3248,7 @@ usage: (make-network-process &rest ARGS) */)
{
/* Unlike most other syscalls connect() cannot be called
again. (That would return EALREADY.) The proper way to
- wait for completion is pselect(). */
+ wait for completion is pselect(). */
int sc;
socklen_t len;
fd_set fdset;
@@ -3626,7 +3626,7 @@ static const struct ifflag_def ifflag_table[] = {
#endif
#ifdef IFF_NOTRAILERS
#ifdef NS_IMPL_COCOA
- /* Really means smart, notrailers is obsolete */
+ /* Really means smart, notrailers is obsolete. */
{ IFF_NOTRAILERS, "smart" },
#else
{ IFF_NOTRAILERS, "notrailers" },
@@ -3654,19 +3654,19 @@ static const struct ifflag_def ifflag_table[] = {
{ IFF_DYNAMIC, "dynamic" },
#endif
#ifdef IFF_OACTIVE
- { IFF_OACTIVE, "oactive" }, /* OpenBSD: transmission in progress */
+ { IFF_OACTIVE, "oactive" }, /* OpenBSD: transmission in progress. */
#endif
#ifdef IFF_SIMPLEX
- { IFF_SIMPLEX, "simplex" }, /* OpenBSD: can't hear own
transmissions */
+ { IFF_SIMPLEX, "simplex" }, /* OpenBSD: can't hear own transmissions.
*/
#endif
#ifdef IFF_LINK0
- { IFF_LINK0, "link0" }, /* OpenBSD: per link layer defined bit
*/
+ { IFF_LINK0, "link0" }, /* OpenBSD: per link layer defined bit. */
#endif
#ifdef IFF_LINK1
- { IFF_LINK1, "link1" }, /* OpenBSD: per link layer defined bit
*/
+ { IFF_LINK1, "link1" }, /* OpenBSD: per link layer defined bit. */
#endif
#ifdef IFF_LINK2
- { IFF_LINK2, "link2" }, /* OpenBSD: per link layer defined bit
*/
+ { IFF_LINK2, "link2" }, /* OpenBSD: per link layer defined bit. */
#endif
{ 0, 0 }
};
@@ -3882,7 +3882,7 @@ deactivate_process (Lisp_Object proc)
}
#endif
- /* Beware SIGCHLD hereabouts. */
+ /* Beware SIGCHLD hereabouts. */
for (i = 0; i < PROCESS_OPEN_FDS; i++)
close_process_fd (&p->open_fd[i]);
@@ -3997,10 +3997,10 @@ is nil, from any process) before the timeout expired.
*/)
return
((wait_reading_process_output (secs, nsecs, 0, 0,
- Qnil,
- !NILP (process) ? XPROCESS (process) : NULL,
- NILP (just_this_one) ? 0 :
- !INTEGERP (just_this_one) ? 1 : -1)
+ Qnil,
+ !NILP (process) ? XPROCESS (process) : NULL,
+ (NILP (just_this_one) ? 0
+ : !INTEGERP (just_this_one) ? 1 : -1))
<= 0)
? Qnil : Qt);
}
@@ -4014,7 +4014,7 @@ server_accept_connection (Lisp_Object server, int channel)
{
Lisp_Object proc, caller, name, buffer;
Lisp_Object contact, host, service;
- struct Lisp_Process *ps= XPROCESS (server);
+ struct Lisp_Process *ps = XPROCESS (server);
struct Lisp_Process *p;
int s;
union u_sockaddr {
@@ -4347,7 +4347,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
{
/* A negative timeout means
gobble output available now
- but don't wait at all. */
+ but don't wait at all. */
timeout = make_timespec (0, 0);
}
@@ -4506,11 +4506,11 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
break;
}
- /* Wait till there is something to do */
+ /* Wait till there is something to do. */
if (wait_proc && just_wait_proc)
{
- if (wait_proc->infd < 0) /* Terminated */
+ if (wait_proc->infd < 0) /* Terminated. */
break;
FD_SET (wait_proc->infd, &Available);
check_delay = 0;
@@ -4641,7 +4641,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
}
else
{
- /* Check this specific channel. */
+ /* Check this specific channel. */
if (wait_proc->gnutls_p /* Check for valid process. */
&& wait_proc->gnutls_state
/* Do we have pending data? */
@@ -4661,7 +4661,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
xerrno = errno;
- /* Make C-g and alarm signals set flags again */
+ /* Make C-g and alarm signals set flags again. */
clear_waiting_for_input ();
/* If we woke up due to SIGWINCH, actually change size now. */
@@ -4680,9 +4680,9 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
report_file_errno ("Failed select", Qnil, xerrno);
}
- /* Check for keyboard input */
+ /* Check for keyboard input. */
/* If there is any, return immediately
- to give it higher priority than subprocesses */
+ to give it higher priority than subprocesses. */
if (read_kbd != 0)
{
@@ -5691,7 +5691,7 @@ return t unconditionally. */)
return Qt;
}
-/* send a signal number SIGNO to PROCESS.
+/* Send a signal number SIGNO to PROCESS.
If CURRENT_GROUP is t, that means send to the process group
that currently owns the terminal being used to communicate with PROCESS.
This is used for various commands in shell mode.
@@ -5794,11 +5794,11 @@ process_send_signal (Lisp_Object process, int signo,
Lisp_Object current_group,
Or perhaps this is vestigial. */
if (gid == -1)
no_pgrp = 1;
-#else /* ! defined (TIOCGPGRP ) */
+#else /* ! defined (TIOCGPGRP) */
/* Can't select pgrps on this system, so we know that
the child itself heads the pgrp. */
gid = p->pid;
-#endif /* ! defined (TIOCGPGRP ) */
+#endif /* ! defined (TIOCGPGRP) */
/* If current_group is lambda, and the shell owns the terminal,
don't send any signal. */
@@ -5980,8 +5980,8 @@ SIGCODE may be an integer, or a symbol whose name is a
signal name. */)
Lisp_Object tem = Fget_process (process);
if (NILP (tem))
{
- Lisp_Object process_number =
- string_to_number (SSDATA (process), 10, 1);
+ Lisp_Object process_number
+ = string_to_number (SSDATA (process), 10, 1);
if (INTEGERP (process_number) || FLOATP (process_number))
tem = process_number;
}
@@ -6164,7 +6164,7 @@ static signal_handler_t volatile lib_child_handler;
Inc.
** Malloc WARNING: This should never call malloc either directly or
- indirectly; if it does, that is a bug */
+ indirectly; if it does, that is a bug. */
static void
handle_child_signal (int sig)
@@ -6237,7 +6237,7 @@ handle_child_signal (int sig)
#ifdef NS_IMPL_GNUSTEP
/* NSTask in GNUstep sets its child handler each time it is called.
So we must re-set ours. */
- catch_child_signal();
+ catch_child_signal ();
#endif
}
@@ -6769,7 +6769,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
xerrno = errno;
- /* Make C-g and alarm signals set flags again */
+ /* Make C-g and alarm signals set flags again. */
clear_waiting_for_input ();
/* If we woke up due to SIGWINCH, actually change size now. */
@@ -6789,7 +6789,7 @@ wait_reading_process_output (intmax_t time_limit, int
nsecs, int read_kbd,
report_file_errno ("Failed select", Qnil, xerrno);
}
- /* Check for keyboard input */
+ /* Check for keyboard input. */
if (read_kbd
&& detect_input_pending_run_timers (do_display))
@@ -6858,7 +6858,7 @@ add_timer_wait_descriptor (int fd)
void
add_keyboard_wait_descriptor (int desc)
{
-#ifdef subprocesses /* actually means "not MSDOS" */
+#ifdef subprocesses /* Actually means "not MSDOS". */
FD_SET (desc, &input_wait_mask);
FD_SET (desc, &non_process_wait_mask);
if (desc > max_input_desc)
@@ -6949,7 +6949,7 @@ the process output. */)
}
/* Kill all processes associated with `buffer'.
- If `buffer' is nil, kill all processes */
+ If `buffer' is nil, kill all processes. */
void
kill_buffer_processes (Lisp_Object buffer)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b76bea4: Various minor details accumulated over time,
Stefan Monnier <=