Merge remote-tracking branch 'savannah/master' into HEAD

4 files changed, 50 insertions, 25 deletions

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index cdbb59a5add..6122caf5189 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3560,19 +3560,18 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
            "\\(\\`\n?\\|^\n\\)="        ; POD
            "\\|"
            ;; One extra () before this:
-           "<<~?"                       ; HERE-DOC
-           "\\("                        ; 1 + 1
+           "<<\\(~?\\)"          ; HERE-DOC, indented-p = capture 2
+           "\\("                        ; 2 + 1
            ;; First variant "BLAH" or just ``.
            "[ \t]*"                     ; Yes, whitespace is allowed!
-           "\\([\"'`]\\)"               ; 2 + 1 = 3
-           "\\([^\"'`\n]*\\)"           ; 3 + 1
-           "\\3"
+           "\\([\"'`]\\)"               ; 3 + 1 = 4
+           "\\([^\"'`\n]*\\)"           ; 4 + 1
+           "\\4"
            "\\|"
            ;; Second variant: Identifier or \ID (same as 'ID') or empty
-           "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 4 + 1, 5 + 1
+           "\\\\?\\(\\([a-zA-Z_][a-zA-Z_0-9]*\\)?\\)" ; 5 + 1, 6 + 1
            ;; Do not have <<= or << 30 or <<30 or << $blah.
            ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1
-           "\\(\\)"             ; To preserve count of pars :-( 6 + 1
            "\\)"
            "\\|"
            ;; 1+6 extra () before this:
@@ -3762,11 +3761,11 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                ;;    ;; "\\([^= \t0-9$@%&]\\|[ \t]+[^ \t\n0-9$@%&]\\)" ; 6 + 1
                ;;    "\\(\\)"           ; To preserve count of pars :-( 6 + 1
                ;;  "\\)"
-               ((match-beginning 2)     ; 1 + 1
+               ((match-beginning 3)     ; 2 + 1
                 (setq b (point)
                       tb (match-beginning 0)
                       c (and            ; not HERE-DOC
-                         (match-beginning 5)
+                         (match-beginning 6)
                          (save-match-data
                            (or (looking-at "[ \t]*(") ; << function_call()
                                (save-excursion ; 1 << func_name, or $foo << 10
@@ -3793,17 +3792,17 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                                                    (looking-at "\\(printf?\\|say\\|system\\|exec\\|sort\\)\\>")))
                                                 (error t)))))))
                                    (error nil))) ; func(<<EOF)
-                               (and (not (match-beginning 6)) ; Empty
+                               (and (not (match-beginning 7)) ; Empty
                                     (looking-at
                                      "[ \t]*[=0-9$@%&(]"))))))
                 (if c                   ; Not here-doc
                     nil                 ; Skip it.
-                  (setq c (match-end 2)) ; 1 + 1
-                  (if (match-beginning 5) ;4 + 1
-                      (setq b1 (match-beginning 5) ; 4 + 1
-                            e1 (match-end 5)) ; 4 + 1
-                    (setq b1 (match-beginning 4) ; 3 + 1
-                          e1 (match-end 4))) ; 3 + 1
+                  (setq c (match-end 3)) ; 2 + 1
+                  (if (match-beginning 6) ;6 + 1
+                      (setq b1 (match-beginning 6) ; 5 + 1
+                            e1 (match-end 6)) ; 5 + 1
+                    (setq b1 (match-beginning 5) ; 4 + 1
+                          e1 (match-end 5))) ; 4 + 1
                   (setq tag (buffer-substring b1 e1)
                         qtag (regexp-quote tag))
                   (cond (cperl-pod-here-fontify
@@ -3818,8 +3817,10 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
                   (setq b (point))
                   ;; We do not search to max, since we may be called from
                   ;; some hook of fontification, and max is random
-                  (or (and (re-search-forward (concat "^[ \t]*" qtag "$")
-                                              stop-point 'toend)
+                  (or (and (re-search-forward
+                            (concat "^" (when (equal (match-string 2) "~") "[ \t]*")
+                                    qtag "$")
+                            stop-point 'toend)
                            ;;;(eq (following-char) ?\n) ; XXXX WHY???
                            )
                     (progn              ; Pretend we matched at the end
@@ -5752,7 +5753,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
               (if (eq (char-after (match-beginning 2)) ?%)
                   'cperl-hash-face
                 'cperl-array-face)
-              t)                        ; arrays and hashes
+              nil)                      ; arrays and hashes
              ("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)"
               1
               (if (= (- (match-end 2) (match-beginning 2)) 1)
@@ -6499,9 +6500,10 @@ If optional argument ALL is `recursive', will process Perl files
 in subdirectories too."
   (interactive)
   (let ((cmd "etags")
-        (args '("-l" "none" "-r"
+        (args `("-l" "none" "-r"
                 ;;                        1=fullname  2=package?             3=name                       4=proto?             5=attrs? (VERY APPROX!)
-                "/\\<" cperl-sub-regexp "[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/"
+                ,(concat
+                  "/\\<" cperl-sub-regexp "[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/")
                 "-r"
                 "/\\<package[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\([#;]\\|$\\)/\\1/"
                 "-r"
@@ -6786,6 +6788,7 @@ Use as
   (or topdir
       (setq topdir default-directory))
   (let ((tags-file-name "TAGS")
+        (inhibit-read-only t)
         (case-fold-search nil)
         xs rel)
     (save-excursion
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 51b9347bb93..b6161351f0b 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -1166,7 +1166,9 @@ Save the result in `project-list-file' if the list of projects has changed."
   (project--ensure-read-project-list)
   (let ((dir (project-root pr)))
     (unless (equal (caar project--list) dir)
-      (setq project--list (assoc-delete-all dir project--list))
+      (dolist (ent project--list)
+        (when (equal dir (car ent))
+          (setq project--list (delq ent project--list))))
       (push (list dir) project--list)
       (project--write-project-list))))
 
@@ -1176,8 +1178,8 @@ If the directory was in the list before the removal, save the
 result in `project-list-file'.  Announce the project's removal
 from the list."
   (project--ensure-read-project-list)
-  (when (assoc pr-dir project--list)
-    (setq project--list (assoc-delete-all pr-dir project--list))
+  (when-let ((ent (assoc pr-dir project--list)))
+    (setq project--list (delq ent project--list))
     (message "Project `%s' not found; removed from list" pr-dir)
     (project--write-project-list)))
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 044d7820ee3..5a47594878e 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -838,7 +838,7 @@ See `sh-feature'.")
          font-lock-variable-name-face))
 
     (rc sh-append es)
-    (bash sh-append sh ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) ))
+    (bash sh-append sh ("\\$(\\([^)\n]+\\)" (1 'sh-quoted-exec t) ))
     (sh sh-append shell
         ;; Variable names.
         ("\\$\\({#?\\)?\\([[:alpha:]_][[:alnum:]_]*\\|[-#?@!]\\)" 2
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index c86fc59ac16..a70b5ed60d6 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -1508,6 +1508,22 @@ Based on `comint-mode-map'.")
     table)
   "Syntax table used in `sql-mode' and `sql-interactive-mode'.")
 
+;;; Syntax Properties
+
+;; `sql--syntax-propertize-escaped-apostrophe', as follows, was
+;; (analysed and) adapted from `pascal--syntax-propertize' in
+;; pascal.el because basic syntax parsing cannot handle the SQL ''
+;; construct within strings.
+
+(defconst sql--syntax-propertize-escaped-apostrophe
+  (syntax-propertize-rules
+   ("''"
+    (0
+     (if (save-excursion (nth 3 (syntax-ppss (match-beginning 0))))
+         (string-to-syntax ".")
+       (forward-char -1)
+       nil)))))
+
 ;; Font lock support
 
 (defvar sql-mode-font-lock-object-name
@@ -4210,6 +4226,10 @@ must tell Emacs.  Here's how to do that in your init file:
   (setq-local abbrev-all-caps 1)
   ;; Contains the name of database objects
   (set (make-local-variable 'sql-contains-names) t)
+  ;; Activate punctuation syntax table property for
+  ;; escaped apostrophes within strings:
+  (setq-local syntax-propertize-function
+              sql--syntax-propertize-escaped-apostrophe)
   ;; Set syntax and font-face highlighting
   ;; Catch changes to sql-product and highlight accordingly
   (sql-set-product (or sql-product 'ansi)) ; Fixes bug#13591