commit 098d29af10a869e65a36804579f16edc49aabcfa (HEAD, refs/remotes/origin/master)
Author: Mark Oteiza <mvoteiza@udel.edu>
Date:   Thu Jul 14 18:23:40 2016 -0400

    Revert "Add a couple cells to lisp-prettify-symbols-alist"
    
    This reverts commit bdda4855c635ecf4135e23321bdba023e9ae65c9.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index ee3bda9..a277d7a 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -168,10 +168,7 @@
 (defvar lisp-doc-string-elt-property 'doc-string-elt
   "The symbol property that holds the docstring position info.")
 
-(defconst lisp-prettify-symbols-alist
-  '(("lambda" . ?λ)
-    ("sqrt" . ?√)
-    ("not" . ?¬))
+(defconst lisp-prettify-symbols-alist '(("lambda"  . ?λ))
   "Alist of symbol/\"pretty\" characters to be displayed.")
 
 ;;;; Font-lock support.

commit 0ea47a6159f351f32b7dbc68debe99eb02f2dd8d
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Thu Jul 14 09:45:05 2016 -0400

    * lisp/simple.el (shell-command): Add save-match-data comment

diff --git a/lisp/simple.el b/lisp/simple.el
index 6d7f00f..a757876 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3328,6 +3328,8 @@ the use of a shell (with its need to quote arguments)."
 				     (current-buffer)))))
 	;; Output goes in a separate buffer.
 	;; Preserve the match data in case called from a program.
+        ;; FIXME: It'd be ridiculous for an Elisp function to call
+        ;; shell-command and assume that it won't mess the match-data!
 	(save-match-data
 	  (if (string-match "[ \t]*&[ \t]*\\'" command)
 	      ;; Command ending with ampersand means asynchronous.

commit d0dc74a3a8bc59df3ca88810710d1234a9a08920
Author: Alan Mackenzie <acm@muc.de>
Date:   Thu Jul 14 12:42:17 2016 +0000

    CC Mode: correct incorrect invocation of parse-partial-sexp.
    
    Fixes bug #23944.
    
    * lisp/progmodes/cc-engine.el (c-literal-limits): make the sixth argument of
    an invocation of parse-partial-sexp 'syntax-table, not the fourth.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 8648bec..51d278f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2326,7 +2326,7 @@ comment at the start of cc-engine.el for more info."
 		    ((nth 7 s) 'c++)
 		    (t 'c)))
 	  (list s ty (nth 8 s)))
-	 
+
 	 ((and (not not-in-delimiter)	; inside a comment starter
 	       (not (bobp))
 	       (progn (backward-char)
@@ -2335,12 +2335,12 @@ comment at the start of cc-engine.el for more info."
 			   (looking-at c-comment-start-regexp))))
 	  (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++))
 	  (list s ty (point)))
-	 
+
 	 (t (list s)))))))
 
 (defun c-state-full-pp-to-literal (here &optional not-in-delimiter)
   ;; This function will supersede c-state-pp-to-literal.
-  ;; 
+  ;;
   ;; Do a parse-partial-sexp from a position in the buffer before HERE which
   ;; isn't in a literal, and return information about HERE, either:
   ;; (STATE TYPE (BEG . END))   if HERE is in a literal; or
@@ -4821,8 +4821,9 @@ comment at the start of cc-engine.el for more info."
 		(when (or (nth 3 s) (nth 4 s))
 		  (cons (nth 8 s)
 			(progn (parse-partial-sexp (point) (point-max)
-						   nil 'syntax-table
-						   s)
+						   nil nil
+						   s
+						   'syntax-table)
 			       (point)))))
 	    (let ((pp-to-lit (c-state-full-pp-to-literal pos not-in-delimiter)))
 	      (car (cddr pp-to-lit))))))