master updated (041aa3ffc65 -> a39a8060124)

[Andrea Corallo]

akrl pushed a change to branch master.

      from  041aa3ffc65 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
       new  6e1bb713f61 Change 'type' declaration to 'ftype'
       new  b87670b5646 * Allow for optional function name parameter in 'ftype' 
declaration
       new  e0cbed16b45 * etc/NEWS: Rename 'type' -> 'ftype' and tweak it.
       new  a39a8060124 * doc/lispref/functions.texi (Declare Form): Rename and 
update 'ftype' entry.


Summary of changes:
 doc/lispref/functions.texi    | 12 +++++++-----
 etc/NEWS                      |  9 +++++----
 lisp/custom.el                |  2 +-
 lisp/emacs-lisp/byte-run.el   |  8 ++++++--
 lisp/emacs-lisp/comp.el       |  4 ++--
 lisp/emacs-lisp/lisp.el       |  2 +-
 lisp/emacs-lisp/regexp-opt.el |  2 +-
 lisp/env.el                   |  2 +-
 lisp/files.el                 |  2 +-
 lisp/simple.el                |  6 +++---
 lisp/subr.el                  | 24 ++++++++++++------------
 lisp/window.el                |  6 +++---
 12 files changed, 43 insertions(+), 36 deletions(-)