Revert "use more efficient looking-at-p instead of looking-at in most places"

This reverts commit e49aadc.

Conflicts:
	haskell-font-lock.el

Author: gracjan

haskell-cabal.el

@@ -325,11 +325,11 @@ OTHER-WINDOW use `find-file-other-window'."
   (save-excursion
     (beginning-of-line)
     (cond
-     ((looking-at-p haskell-cabal-subsection-header-regexp) 'subsection-header)
-     ((looking-at-p haskell-cabal-section-header-regexp) 'section-header)
-     ((looking-at-p haskell-cabal-comment-regexp) 'comment)
-     ((looking-at-p haskell-cabal-empty-regexp) 'empty)
-     ((looking-at-p haskell-cabal-conditional-regexp ) 'conditional)
+     ((looking-at haskell-cabal-subsection-header-regexp ) 'subsection-header)
+     ((looking-at haskell-cabal-section-header-regexp) 'section-header)
+     ((looking-at haskell-cabal-comment-regexp) 'comment)
+     ((looking-at haskell-cabal-empty-regexp ) 'empty)
+     ((looking-at haskell-cabal-conditional-regexp ) 'conditional)
      (t 'section-data))))
 
 (defun haskell-cabal-header-p ()
@@ -509,7 +509,7 @@ resultung buffer-content"
   "Does line only contain whitespaces and comments?"
   (save-excursion
     (beginning-of-line)
-    (looking-at-p "^[ \t]*\\(?:--.*\\)?$")))
+    (looking-at "^[ \t]*\\(?:--.*\\)?$")))
 
 (defun haskell-cabal-kill-indentation ()
   "Remove longest common whitespace prefix from each line"

haskell-commands.el

@@ -188,8 +188,8 @@ PROCESS."
     (let ((hoogle-error (call-process "hoogle" nil t nil "search" "--exact" ident)))
       (goto-char (point-min))
       (unless (or (/= 0 hoogle-error)
-                  (looking-at-p "^No results found")
-                  (looking-at-p "^package "))
+                  (looking-at "^No results found")
+                  (looking-at "^package "))
         (while (re-search-forward "^\\([^ ]+\\).*$" nil t)
           (replace-match "\\1" nil nil))
         (cl-remove-if (lambda (a) (string= "" a))

haskell-decl-scan.el

@@ -152,12 +152,12 @@ Point is not changed."
     (with-syntax-table haskell-ds-syntax-table
       (if (looking-at prefix) (goto-char (match-end 0)))
       ;; Keyword.
-      (if (looking-at-p haskell-ds-start-keywords-re)
+      (if (looking-at haskell-ds-start-keywords-re)
           nil
         (or ;; Parenthesized symbolic variable.
          (and (looking-at "(\\(\\s_+\\))") (match-string-no-properties 1))
          ;; General case.
-         (if (looking-at-p
+         (if (looking-at
               (if (eq ?\( (char-after))
                   ;; Skip paranthesised expression.
                   (progn
@@ -187,7 +187,7 @@ current line that starts with REGEXP and is not in `font-lock-comment-face'."
   ;; no effect on efficiency.  It is probably not called enough to do
   ;; so.
   (while (and (= (forward-line inc) 0)
-              (or (not (looking-at-p regexp))
+              (or (not (looking-at regexp))
                   (eq (get-text-property (point) 'face)
                       'font-lock-comment-face)))))
 
@@ -257,7 +257,7 @@ then point does not move if already at the start of a declaration."
                      ;; Checking the face to ensure a declaration starts
                      ;; here seems to be the only addition to make this
                      ;; module support LaTeX-style literate scripts.
-                     (if (and (looking-at-p start-decl-re)
+                     (if (and (looking-at start-decl-re)
                               (not (elt (syntax-ppss) 4)))
                          (match-beginning 1)))))
         (if (and start
@@ -310,7 +310,7 @@ then point does not move if already at the start of a declaration."
           ;; start with a declaration, move forward to start of next
           ;; declaration (which must exist).  Otherwise, we are done.
           (if (and (not direction)
-                   (or (and (looking-at-p start-decl-re)
+                   (or (and (looking-at start-decl-re)
                             (not (string= name
                                           ;; Note we must not use
                                           ;; newname here as this may
@@ -319,12 +319,12 @@ then point does not move if already at the start of a declaration."
                                           ;; of the buffer.
                                           (haskell-ds-get-variable
                                            line-prefix))))
-                       (and (not (looking-at-p start-decl-re))
+                       (and (not (looking-at start-decl-re))
                             (bobp))))
               (haskell-ds-move-to-start-regexp-skipping-comments 1 start-decl-re)))
         ;; Store whether we are at the start of a declaration or not.
         ;; Used to calculate final result.
-        (let ((at-start-decl (looking-at-p start-decl-re)))
+        (let ((at-start-decl (looking-at start-decl-re)))
           ;; If we are at the beginning of a line, move over
           ;; line-prefix, if present at point.
           (if (bolp)

haskell-doc.el

@@ -1830,7 +1830,7 @@ ToDo: Check for matching parenthesis!."
           (let ((here (point)))
             (goto-char here)
             (skip-chars-forward " \t")
-            (if (looking-at-p "--")  ; it is a comment line
+            (if (looking-at "--")  ; it is a comment line
                 (progn
                   (forward-line 1)
                   (end-of-line)

haskell-font-lock.el

@@ -383,10 +383,10 @@ that should be commented under LaTeX-style literate scripts."
    ;; delimeters {-# .. #-}.
    ((save-excursion
       (goto-char (nth 8 state))
-      (and (looking-at-p "{-#")
+      (and (looking-at "{-#")
            (forward-comment 1)
            (goto-char (- (point) 3))
-           (looking-at-p "#-}")))
+           (looking-at "#-}")))
     'haskell-pragma-face)
    ;; Haddock comment start with either "-- [|^*$]" or "{- ?[|^*$]"
    ;; (note space optional for nested comments and mandatory for
@@ -402,8 +402,8 @@ that should be commented under LaTeX-style literate scripts."
    ;; comments newline is outside of comment.
    ((save-excursion
       (goto-char (nth 8 state))
-      (or (looking-at-p "\\(?:{- ?\\|-- \\)[|^*$]")
-	  (and (looking-at-p "--")            ; are we at double dash comment
+      (or (looking-at "\\(?:{- ?\\|-- \\)[|^*$]")
+	  (and (looking-at "--")              ; are we at double dash comment
 	       (forward-line -1)              ; this is nil on first line
 	       (eq (get-text-property (line-end-position) 'face)
 		   'font-lock-doc-face)	      ; is a doc face

haskell-indent.el

@@ -192,7 +192,7 @@ followed by an OFFSET (if present use its value otherwise use
     (if (and (eq haskell-literate 'bird)
              (eq (following-char) ?\>))
         (forward-char 1))
-    (looking-at-p "[ \t]*$")))
+    (looking-at "[ \t]*$")))
 
 (defun haskell-indent-back-to-indentation ()
   "`back-to-indentation' function but dealing with Bird-style literate scripts."
@@ -311,7 +311,7 @@ It deals with both Bird style and non Bird-style scripts."
               (delete-region (point) (line-beginning-position 2)))
           (goto-char beg)               ; Remove end.
           (beginning-of-line)
-          (if (looking-at-p "\\\\begin{code}")
+          (if (looking-at "\\\\begin{code}")
               (kill-line 1)))
       (save-excursion                   ; Add the literate indication.
         (goto-char end)
@@ -396,10 +396,10 @@ Returns the location of the start of the comment, nil otherwise."
   (cond
    ((haskell-indent-empty-line-p) 'empty)
    ((haskell-indent-in-comment (point-min) (point)) 'comment)
-   ((looking-at-p "\\(\\([[:alpha:]]\\(\\sw\\|'\\)*\\)\\|_\\)[ \t\n]*")
+   ((looking-at "\\(\\([[:alpha:]]\\(\\sw\\|'\\)*\\)\\|_\\)[ \t\n]*")
     'ident)
-   ((looking-at-p "\\(|[^|]\\)[ \t\n]*") 'guard)
-   ((looking-at-p "\\(=[^>=]\\|::\\|∷\\|→\\|←\\|->\\|<-\\)[ \t\n]*") 'rhs)
+   ((looking-at "\\(|[^|]\\)[ \t\n]*") 'guard)
+   ((looking-at "\\(=[^>=]\\|::\\|∷\\|→\\|←\\|->\\|<-\\)[ \t\n]*") 'rhs)
    (t 'other)))
 
 (defvar haskell-indent-current-line-first-ident ""
@@ -488,7 +488,7 @@ Returns the location of the start of the comment, nil otherwise."
   "Check if there is no otherwise at GUARD."
   (save-excursion
     (goto-char guard)
-    (not (looking-at-p "|[ \t]*otherwise\\>"))))
+    (not (looking-at "|[ \t]*otherwise\\>"))))
 
 
 (defun haskell-indent-guard (start end end-visible indent-info)
@@ -937,12 +937,12 @@ and find indentation info for each part."
   "Return non-nil if point is in front of a `let' that has no `in'.
 START is the position of the presumed `in'."
   ;; We're looking at either `in' or `let'.
-  (when (looking-at-p "let")
+  (when (looking-at "let")
     (ignore-errors
       (save-excursion
         (forward-word 1)
         (forward-comment (point-max))
-        (if (looking-at-p "{")
+        (if (looking-at "{")
             (progn
               (forward-sexp 1)
               (forward-comment (point-max))
@@ -1001,7 +1001,7 @@ OPEN is the start position of the comment in which point is."
              indent-info)))
 
       ;; We really are inside a comment.
-      (if (looking-at-p "-}")
+      (if (looking-at "-}")
           (progn
             (forward-char 2)
             (forward-comment -1)
@@ -1131,7 +1131,7 @@ is at the end of an otherwise-non-empty line."
 
 (defun haskell-indent-inside-paren (open)
   ;; there is an open structure to complete
-  (if (looking-at-p "\\s)\\|[;,]")
+  (if (looking-at "\\s)\\|[;,]")
       ;; A close-paren or a , or ; can only correspond syntactically to
       ;; the open-paren at `open'.  So there is no ambiguity.
       (progn
@@ -1150,7 +1150,7 @@ is at the end of an otherwise-non-empty line."
     (let* ((end (point))
            (basic-indent-info
             ;; Anything else than a ) is subject to layout.
-            (if (looking-at-p "\\s.\\|\\$ ")
+            (if (looking-at "\\s.\\|\\$ ")
                 (haskell-indent-point-to-col open) ; align a punct with (
               (let ((follow (save-excursion
                               (goto-char (1+ open))
@@ -1216,14 +1216,14 @@ START if non-nil is a presumed start pos of the current definition."
      ;; in string?
      ((setq open (haskell-indent-in-string start (point)))
       (list (list (+ (haskell-indent-point-to-col open)
-                     (if (looking-at-p "\\\\") 0 1)))))
+                     (if (looking-at "\\\\") 0 1)))))
 
      ;; in comment ?
      ((setq open (haskell-indent-in-comment start (point)))
       (haskell-indent-comment open start))
 
      ;; Closing the declaration part of a `let' or the test exp part of a case.
-     ((looking-at-p "\\(?:in\\|of\\|then\\|else\\)\\>")
+     ((looking-at "\\(?:in\\|of\\|then\\|else\\)\\>")
       (haskell-indent-closing-keyword start))
 
      ;; Right after a special keyword.
@@ -1378,7 +1378,7 @@ TYPE is either 'guard or 'rhs."
                 (if (<= (haskell-indent-current-indentation) defcol)
                     (progn
                       (move-to-column defcol)
-                      (if (and (looking-at-p defname) ; start of equation
+                      (if (and (looking-at defname) ; start of equation
                                (not (haskell-indent-open-structure start-block (point))))
                           (push (cons (point) 'eqn) eqns-start)
                         ;; found a less indented point not starting an equation

haskell-indentation.el

@@ -517,7 +517,7 @@ the current buffer."
               (goto-char ps)
               (beginning-of-line)))
           (when (and (>= 2 (haskell-indentation-current-indentation))
-                     (not (looking-at-p ">\\s-*$")))
+                     (not (looking-at ">\\s-*$")))
             (forward-char 2)
             (throw 'return nil))
           (when (bobp)
@@ -656,7 +656,7 @@ the current buffer."
 (defun haskell-indentation-declaration-layout ()
   (haskell-indentation-layout #'haskell-indentation-declaration))
 
-;; a layout list with case expressions
+;; a layout list with case expressions 
 (defun haskell-indentation-case-layout ()
   (haskell-indentation-layout #'haskell-indentation-case))
 
@@ -905,7 +905,7 @@ the current buffer."
                 (throw 'parse-end nil))
 
 	      ;; after an 'open' expression such as 'if', exit
-              (unless (member (car parser) '("(" "[" "{" "do" "case"))
+              (unless (member (car parser) '("(" "[" "{" "do" "case")) 
                 (throw 'return nil)))))))))
 
 (defun haskell-indentation-test-indentations ()
@@ -961,7 +961,7 @@ the current buffer."
 ;; and current-indent after the separator
 ;; For example:
 ;; l = [  1
-;;      , 2
+;;      , 2  
 ;;      ,    -- start now here
 
 (defun haskell-indentation-at-separator ()
@@ -1174,7 +1174,7 @@ the current buffer."
         ((looking-at "\\(→\\|←\\|∷\\)\\([^-:!#$%&*+./<=>?@\\\\^|~]\\|$\\)")
          (let ((tok (match-string-no-properties 1)))
            (or (cdr (assoc tok haskell-indentation-unicode-tokens)) tok)))
-        ((looking-at-p "[-:!#$%&*+./<=>?@\\\\^|~`]")
+        ((looking-at"[-:!#$%&*+./<=>?@\\\\^|~`]" )
          'operator)
         (t 'value)))
 

haskell-interactive-mode.el

@@ -485,7 +485,7 @@ FILE-NAME only."
                (let ((msg-file-name (match-string-no-properties 1))
                      (msg-startpos (line-beginning-position)))
                  ;; skip over hanging continuation message lines
-                 (while (progn (forward-line) (looking-at-p "^[ ]+")))
+                 (while (progn (forward-line) (looking-at "^[ ]+")))
 
                  (when (or (not file-name) (string= file-name msg-file-name))
                    (let ((inhibit-read-only t))
@@ -656,7 +656,7 @@ FILE-NAME only."
         (haskell-interactive-mode-error-forward))
 
       (setq reset-locus t)
-      (unless (looking-at-p haskell-interactive-mode-error-regexp)
+      (unless (looking-at haskell-interactive-mode-error-regexp)
         (error "no errors found")))
 
     ;; move point if needed

haskell-mode.el

@@ -518,12 +518,12 @@ May return a qualified name."
         ;; If we're looking at a module ID that qualifies further IDs, add
         ;; those IDs.
         (goto-char start)
-        (while (and (looking-at-p "[[:upper:]]") (eq (char-after end) ?.)
+        (while (and (looking-at "[[:upper:]]") (eq (char-after end) ?.)
                     ;; It's a module ID that qualifies further IDs.
                     (goto-char (1+ end))
                     (save-excursion
                       (when (not (zerop (skip-syntax-forward
-                                         (if (looking-at-p "\\s_") "_" "w'"))))
+                                         (if (looking-at "\\s_") "_" "w'"))))
                         (setq end (point))))))
         ;; If we're looking at an ID that's itself qualified by previous
         ;; module IDs, add those too.
@@ -533,7 +533,7 @@ May return a qualified name."
                     (progn (forward-char -1)
                            (not (zerop (skip-syntax-backward "w'"))))
                     (skip-syntax-forward "'")
-                    (looking-at-p "[[:upper:]]"))
+                    (looking-at "[[:upper:]]"))
           (setq start (point)))
         ;; This is it.
         (cons start end)))))
@@ -965,14 +965,14 @@ LOC = (list FILE LINE COL)"
 (defun haskell-mode-insert-scc-at-point ()
   "Insert an SCC annotation at point."
   (interactive)
-  (if (or (looking-at-p "\\b\\|[ \t]\\|$") (and (not (bolp))
-                                                (save-excursion
-                                                  (forward-char -1)
-                                                  (looking-at-p "\\b\\|[ \t]"))))
-      (let ((space-at-point (looking-at-p "[ \t]")))
+  (if (or (looking-at "\\b\\|[ \t]\\|$") (and (not (bolp))
+                                              (save-excursion
+                                                (forward-char -1)
+                                                (looking-at "\\b\\|[ \t]"))))
+      (let ((space-at-point (looking-at "[ \t]")))
         (unless (and (not (bolp)) (save-excursion
                                     (forward-char -1)
-                                    (looking-at-p "[ \t]")))
+                                    (looking-at "[ \t]")))
           (insert " "))
         (insert "{-# SCC \"\" #-}")
         (unless space-at-point

haskell-simple-indent.el

@@ -112,7 +112,7 @@ point beyond the current column, position given by
                       (not (zerop invisible-from)))
                   (zerop (forward-line -1)))
         ;; Ignore empty lines.
-        (if (not (looking-at-p "[ \t]*\n"))
+        (if (not (looking-at "[ \t]*\n"))
             (let ((this-indentation (current-indentation)))
               ;; Is this line so indented that it cannot have
               ;; influence on indentation points?