Merge branch 'master' into cairo

[gnu-emacs] / lisp / filesets.el

diff --git a/lisp/filesets.el b/lisp/filesets.el
index fbf28dbecbc921736ff8f0e0c18666871e6e793b..f990333006b7e75bfa4d3c0d991cf696be681173 100644 (file)
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,9 +1,9 @@
 ;;; filesets.el --- handle group of files -*- coding: utf-8 -*-
 
 ;;; filesets.el --- handle group of files -*- coding: utf-8 -*-
 

-;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2015 Free Software Foundation, Inc.

 
 ;; Author: Thomas Link <sanobast-emacs@yahoo.de>
 
 ;; Author: Thomas Link <sanobast-emacs@yahoo.de>

-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org

 ;; Keywords: filesets convenience
 
 ;; This file is part of GNU Emacs.
 ;; Keywords: filesets convenience
 
 ;; This file is part of GNU Emacs.


@@ -214,8 +214,8 @@ key is supported."
 
 (defun filesets-which-command-p (cmd)
   "Call \"which CMD\" and return non-nil if the command was found."
 
 (defun filesets-which-command-p (cmd)
   "Call \"which CMD\" and return non-nil if the command was found."

-  (when (string-match (format "\\(/[^/]+\\)?/%s" cmd)
-                     (filesets-which-command cmd))
+  (when (string-match-p (format "\\(/[^/]+\\)?/%s" cmd)
+                       (filesets-which-command cmd))

     cmd))
 
 (defun filesets-message (level &rest args)
     cmd))
 
 (defun filesets-message (level &rest args)


@@ -1082,7 +1082,7 @@ defined in `filesets-ingroup-patterns'."
 
     (require 'easymenu)
 
 
     (require 'easymenu)
 

-    (defun filesets-error (class &rest args)
+    (defun filesets-error (_class &rest args)

       "`error' wrapper."
       (error "%s" (mapconcat 'identity args " ")))
 
       "`error' wrapper."
       (error "%s" (mapconcat 'identity args " ")))
 


@@ -1093,10 +1093,10 @@ defined in `filesets-ingroup-patterns'."
 If NEGATIVE is non-nil, remove all directory names."
   (filesets-filter-list lst
                        (lambda (x)
 If NEGATIVE is non-nil, remove all directory names."
   (filesets-filter-list lst
                        (lambda (x)

-                         (and (not (string-match "^\\.+/$" x))
+                         (and (not (string-match-p "^\\.+/$" x))

                               (if negative
                               (if negative

-                                  (not (string-match "[:/\\]$" x))
-                                (string-match "[:/\\]$" x))))))
+                                  (not (string-match-p "[:/\\]$" x))
+                                (string-match-p "[:/\\]$" x))))))

 
 (defun filesets-conditional-sort (lst &optional access-fn)
   "Return a sorted copy of LST, LST being a list of strings.
 
 (defun filesets-conditional-sort (lst &optional access-fn)
   "Return a sorted copy of LST, LST being a list of strings.


@@ -1130,18 +1130,18 @@ Return full path if FULL-FLAG is non-nil."
          (dirs  nil))
       (dolist (this (file-name-all-completions "" dir))
        (cond
          (dirs  nil))
       (dolist (this (file-name-all-completions "" dir))
        (cond

-        ((string-match "^\\.+/$" this)
+        ((string-match-p "^\\.+/$" this)

          nil)
          nil)

-        ((string-match "[:/\\]$" this)
+        ((string-match-p "[:/\\]$" this)

          (when (or (not match-dirs-flag)
                    (not pattern)
          (when (or (not match-dirs-flag)
                    (not pattern)

-                   (string-match pattern this))
+                   (string-match-p pattern this))

            (filesets-message 5 "Filesets: matched dir %S with pattern %S"
                              this pattern)
            (setq dirs (cons this dirs))))
         (t
          (when (or (not pattern)
            (filesets-message 5 "Filesets: matched dir %S with pattern %S"
                              this pattern)
            (setq dirs (cons this dirs))))
         (t
          (when (or (not pattern)

-                   (string-match pattern this))
+                   (string-match-p pattern this))

            (filesets-message 5 "Filesets: matched file %S with pattern %S"
                              this pattern)
            (setq files (cons (if full-flag
            (filesets-message 5 "Filesets: matched file %S with pattern %S"
                              this pattern)
            (setq files (cons (if full-flag


@@ -1249,7 +1249,7 @@ Return full path if FULL-FLAG is non-nil."
   (let ((filename (file-name-nondirectory file)))
     (filesets-some
      (lambda (entry)
   (let ((filename (file-name-nondirectory file)))
     (filesets-some
      (lambda (entry)

-       (when (and (string-match (nth 0 entry) filename)
+       (when (and (string-match-p (nth 0 entry) filename)

                  (filesets-eviewer-constraint-p entry))
         entry))
      filesets-external-viewers)))
                  (filesets-eviewer-constraint-p entry))
         entry))
      filesets-external-viewers)))


@@ -1767,7 +1767,7 @@ Use LOOKUP-NAME for searching additional data if provided."
                                    n name)))
              (dolist (this files nil)
                (filesets-file-open open-function this))
                                    n name)))
              (dolist (this files nil)
                (filesets-file-open open-function this))

-           (message "Filesets: cancelled")))
+           (message "Filesets: canceled")))

       (filesets-error 'error "Filesets: Unknown fileset: " name))))
 
 (defun filesets-close (&optional mode name lookup-name)
       (filesets-error 'error "Filesets: Unknown fileset: " name))))
 
 (defun filesets-close (&optional mode name lookup-name)


@@ -2004,7 +2004,7 @@ LOOKUP-NAME is used as lookup name for retrieving fileset specific settings."
        (fn (or fun (lambda (a b)
                      (and (stringp a)
                           (stringp b)
        (fn (or fun (lambda (a b)
                      (and (stringp a)
                           (stringp b)

-                          (string-match a b))))))
+                          (string-match-p a b))))))

     (filesets-some (lambda (x)
                     (if (funcall fn (car x) masterfile)
                         (nth pos x)
     (filesets-some (lambda (x)
                     (if (funcall fn (car x) masterfile)
                         (nth pos x)