From: Noam Postavsky <npostavs@gmail.com>
Date: Wed, 26 Jun 2019 02:04:13 +0000 (-0400)
Subject: Merge from emacs-26
X-Git-Tag: emacs-27.0.90~2212
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9552ee4df7d2ceebb8728a61d00598aa981b580c;p=emacs.git

Merge from emacs-26

e62ad04963 Fix sgml-mode handling of quotes within parens (Bug#36347)
06b35b2f92 ; * lisp/frame.el: Enhance add-variable-watcher commentary.
572e34bb6f Rename 'make-symbolic-link' argument NEWNAME to LINKNAME
04477adedc Check that length of data returned by sysctl is non-zero
81535eeadb * test/lisp/progmodes/python-tests.el (python-virt-bin): D...
9d48979ca8 Fix Python tests depending on system-type
fcf6cc3177 Fix problem with wdired test when symlinks cannot be created.
4701e0663e Improve wording of documentation of click events

# Conflicts:
#	lisp/textmodes/sgml-mode.el
#	test/lisp/textmodes/sgml-mode-tests.el
---

9552ee4df7d2ceebb8728a61d00598aa981b580c
diff --cc lisp/textmodes/sgml-mode.el
index 8d3000e5d8b,c9724e0e3f7..aa00024a6d9
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@@ -610,10 -567,9 +610,11 @@@ Do \\[describe-key] on the following bi
    (setq font-lock-defaults '((sgml-font-lock-keywords
  			      sgml-font-lock-keywords-1
  			      sgml-font-lock-keywords-2)
 -			     nil t))
 +                             nil t nil
 +                             (font-lock-syntactic-face-function
 +                              . sgml-font-lock-syntactic-face)))
    (setq-local syntax-propertize-function #'sgml-syntax-propertize)
+   (setq-local syntax-ppss-table sgml-tag-syntax-table)
    (setq-local facemenu-add-face-function 'sgml-mode-facemenu-add-face-function)
    (setq-local sgml-xml-mode (sgml-xml-guess))
    (unless sgml-xml-mode
diff --cc src/sysdep.c
index f7fc99f147f,b2aecc0ddac..4f89e8aba10
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@@ -3616,10 -3618,10 +3616,10 @@@ system_process_attributes (Lisp_Object 
    CONS_TO_INTEGER (pid, int, proc_id);
    mib[3] = proc_id;
  
-   if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0)
+   if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0 || proclen == 0)
      return attrs;
  
 -  attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float (proc.ki_uid)), attrs);
 +  attrs = Fcons (Fcons (Qeuid, INT_TO_INTEGER (proc.ki_uid)), attrs);
  
    block_input ();
    pw = getpwuid (proc.ki_uid);
diff --cc test/lisp/textmodes/sgml-mode-tests.el
index 34d26480a45,0000b352ff0..5630036e55c
--- a/test/lisp/textmodes/sgml-mode-tests.el
+++ b/test/lisp/textmodes/sgml-mode-tests.el
@@@ -168,9 -138,11 +168,11 @@@ The point is set to the beginning of th
                   "<t>\"a'\"</t>"
                   "<t>'a\"'</t>"
                   "a\"b <tag>c'd</tag>"
 -                 ;;"<tag>c>'d</tag>" Fixed in master.
 +                 "<tag>c>'d</tag>"
                   "<t><!-- \" --></t>"
                   "<t><!-- ' --></t>"
+                  "<t>(')</t>"
+                  "<t>(\")</t>"
                   ))
     (with-temp-buffer
       (sgml-mode)