diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 23:45:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 23:45:27 -0700 |
| commit | ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6 (patch) | |
| tree | e95220daac6b9ffb47966df747308a11c0623179 /lisp/emacs-lisp | |
| parent | d5efd1d1b54595db795d6fddb32404cc74923d77 (diff) | |
| parent | b87a82007428428e2f24af64a59799402bb1651e (diff) | |
| download | emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.tar.gz emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.tar.bz2 emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 5dc2938fe08..6aecc3615f3 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -652,7 +652,7 @@ FILE is the name of a file relative to that base location. This macro retrieves FILE from LOCATION into a temporary buffer, and evaluates BODY while that buffer is current. This work buffer is killed afterwards. Return the last value in BODY." - `(let* ((http (string-match "\\`http:" ,location)) + `(let* ((http (string-match "\\`https?:" ,location)) (buffer (if http (url-retrieve-synchronously (concat ,location ,file)) diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index 59a30d62b02..50a65eb6bbb 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -1,4 +1,4 @@ -;;; re-builder.el --- building Regexps with visual feedback +;;; re-builder.el --- building Regexps with visual feedback -*- lexical-binding: t -*- ;; Copyright (C) 1999-2011 Free Software Foundation, Inc. @@ -506,7 +506,7 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions." (reb-update-regexp) (reb-update-overlays subexp)) -(defun reb-auto-update (beg end lenold &optional force) +(defun reb-auto-update (_beg _end _lenold &optional force) "Called from `after-update-functions' to update the display. BEG, END and LENOLD are passed in from the hook. An actual update is only done if the regexp has changed or if the |