From: Glenn Morris <rgm@gnu.org>
Date: Mon, 10 Sep 2018 20:12:38 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4437
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0407733ef3d4e8e133e91917097dbc9bcc688b47;p=emacs.git

Merge from origin/emacs-26

7efcdf7 (origin/emacs-26) Clarify completion text in the ELisp manual
30b0b0e Fix handling of abbreviated control command in gdb-mi.el
5cf282d Clarify documentation of functions reading character events
96281c5 Record :version for built-in variables while dumping
82160cf * src/process.c (connect_network_socket): Fix memory leak.  (...
6c616e4 * Makefile.in (appdatadir): Use the non-obsolete location "me...
9618e16 Better fix for bug#32550
30d94e4 Fix Bug#32550
57bcdc7 Don't call XGetGeometry for frames without outer X window (Bu...
82fc6b6 * lisp/calculator.el: Fix doc typo.
ddc7c64 Standardize calc bug reporting instructions

Conflicts:
	lisp/cus-start.el
---

0407733ef3d4e8e133e91917097dbc9bcc688b47
diff --cc lisp/cus-start.el
index 1a5b3caea23,8ed0f805d01..88a61753f25
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@@ -711,15 -706,15 +711,17 @@@ since it could result in memory overflo
  	  (put symbol 'risky-local-variable (cadr prop)))
        (if (setq prop (memq :set rest))
  	  (put symbol 'custom-set (cadr prop)))
+       ;; This is used by describe-variable.
+       (if version (put symbol 'custom-version version))
 -      ;; Note this is the _only_ initialize property we handle.
 -      (if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay)
 -          ;; These vars are defined early and should hence be initialized
 -          ;; early, even if this file happens to be loaded late.  so add them
 -          ;; to the end of custom-delayed-init-variables.  Otherwise,
 -          ;; auto-save-file-name-transforms will appear in M-x customize-rogue.
 -	  (add-to-list 'custom-delayed-init-variables symbol 'append))
 +      ;; Don't re-add to custom-delayed-init-variables post-startup.
 +      (unless after-init-time
 +	;; Note this is the _only_ initialize property we handle.
 +	(if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay)
 +	    ;; These vars are defined early and should hence be initialized
 +	    ;; early, even if this file happens to be loaded late.  so add them
 +	    ;; to the end of custom-delayed-init-variables.  Otherwise,
 +	    ;; auto-save-file-name-transforms will appear in customize-rogue.
 +	    (add-to-list 'custom-delayed-init-variables symbol 'append)))
        ;; If this is NOT while dumping Emacs, set up the rest of the
        ;; customization info.  This is the stuff that is not needed
        ;; until someone does M-x customize etc.
diff --cc src/process.c
index ebaaf33e57f,b0a327229c6..4d96e469767
--- a/src/process.c
+++ b/src/process.c
@@@ -3334,10 -3324,8 +3334,8 @@@ connect_network_socket (Lisp_Object pro
    int s = -1, outch, inch;
    int xerrno = 0;
    int family;
-   struct sockaddr *sa = NULL;
    int ret;
 -  ptrdiff_t addrlen;
 +  ptrdiff_t addrlen UNINIT;
    struct Lisp_Process *p = XPROCESS (proc);
    Lisp_Object contact = p->childp;
    int optbits = 0;