commit f478082f9ff22ff41fbd9616ebea75757f9a0311 (HEAD, refs/remotes/origin/master) Author: Stefan Monnier Date: Mon Apr 29 17:29:47 2019 -0400 Refrain from splicing anonymous faces in text properties * lisp/font-lock.el (font-lock-prepend-text-property): Distinguish list of faces from property lists. (font-lock-ensure-function): Remove redundant code. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 1475911195..d0f7096ab8 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1096,7 +1096,7 @@ accessible portion of the current buffer." (lambda (beg end) (unless font-lock-fontified (save-excursion - (font-lock-fontify-region (or beg (point-min)) (or end (point-max)))))) + (font-lock-fontify-region beg end)))) "Function to make sure a region has been fontified. Called with two arguments BEG and END.") @@ -1392,7 +1392,12 @@ delimit the region to fontify." Arguments PROP and VALUE specify the property and value to prepend to the value already in place. The resulting property values are always lists. Optional argument OBJECT is the string or buffer containing the text." - (let ((val (if (listp value) value (list value))) next prev) + (let ((val (if (and (listp value) (not (keywordp (car value)))) + ;; Already a list of faces. + value + ;; A single face (e.g. a plist of face properties). + (list value))) + next prev) (while (/= start end) (setq next (next-single-property-change start prop object end) prev (get-text-property start prop object)) commit 071a6927a89bc013d5e026e446d4ee503c59bc7b Author: Stefan Monnier Date: Mon Apr 29 16:32:52 2019 -0400 * lisp/international/mule-util.el: Avoid setq; clarify meaning of -1. diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index 8ad212796a..de5e7d8323 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -456,7 +456,7 @@ QUALITY can be: (lineno (if (= eol 1) (1- (line-number-at-pos position)) 0)) (type (coding-system-type coding-system)) (base (coding-system-base coding-system)) - byte) + (point-min 1)) ;Clarify what the `1' means. (and (eq type 'utf-8) ;; Any post-read/pre-write conversions mean it's not really UTF-8. (not (null (coding-system-get coding-system :post-read-conversion))) @@ -471,19 +471,17 @@ QUALITY can be: (setq type 'single-byte)) (pcase type ('utf-8 - (setq byte (position-bytes position)) - (when (null byte) - (if (<= position 0) - (setq byte 1) - (setq byte (position-bytes (point-max))))) - (setq byte (1- byte)) - (+ byte + (+ (or (position-bytes position) + (if (<= position 0) + point-min + (position-bytes (point-max)))) ;; Account for BOM, if any. (if (coding-system-get coding-system :bom) 3 0) ;; Account for CR in CRLF pairs. - lineno)) + lineno + (- point-min))) ('single-byte - (+ position -1 lineno)) + (+ position (- point-min) lineno)) ((and 'utf-16 ;; FIXME: For utf-16, we could use the same approach as used for ;; dos EOLs (counting the number of non-BMP chars instead of the @@ -491,14 +489,14 @@ QUALITY can be: (guard (not (eq quality 'exact)))) ;; In approximate mode, assume all characters are within the ;; BMP, i.e. each one takes up 2 bytes. - (+ (* (1- position) 2) + (+ (* (- position point-min) 2) ;; Account for BOM, if any. (if (coding-system-get coding-system :bom) 2 0) ;; Account for CR in CRLF pairs. lineno)) (_ (pcase quality - ('approximate (+ (position-bytes position) -1 lineno)) + ('approximate (+ (position-bytes position) (- point-min) lineno)) ('exact ;; Rather than assume that the file exists and still holds the right ;; data, we reconstruct its relevant portion. @@ -511,7 +509,7 @@ QUALITY can be: (widen) (encode-coding-region (point-min) (min (point-max) position) coding-system tmp-buf))) - (1- (point-max))))))))))) + (buffer-size)))))))))) (provide 'mule-util) commit 21143f92db31e685242a0a372bc2e0846cde7bb0 Author: Paul Eggert Date: Mon Apr 29 12:56:44 2019 -0700 Sync latest SKK-JISYO.L Problem reported by Tsuyoshi Kitamoto (Bug#35442). * leim/SKK-DIC/README: Update to current URL. * leim/SKK-DIC/SKK-JISYO.L: Sync to current upstream version. diff --git a/leim/SKK-DIC/README b/leim/SKK-DIC/README index fa51a57fe1..36236b2bb3 100644 --- a/leim/SKK-DIC/README +++ b/leim/SKK-DIC/README @@ -1,6 +1,12 @@ -This directory contains a copy of the following file: +This directory contains an uncompressed copy of the following file: -http://openlab.ring.gr.jp/skk/skk/dic/SKK-JISYO.L +https://skk-dev.github.io/dict/SKK-JISYO.L.gz This file is free software distributed under the terms of the GNU General Public License. + +For more information about this file, please see: + +http://openlab.ring.gr.jp/skk/dic.html +https://skk-dev.github.io/dict/ +https://github.com/skk-dev/dict diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L index 44d86448fd..6b024e3dc4 100644 --- a/leim/SKK-DIC/SKK-JISYO.L +++ b/leim/SKK-DIC/SKK-JISYO.L @@ -1,6 +1,6 @@ ;; -*- mode: fundamental; coding: euc-jp -*- ;; Large size dictionary for SKK system -;; Copyright (C) 1988-1995, 1997, 1999-2010 +;; Copyright (C) 1988-1995, 1997, 1999-2014 ;; ;; Masahiko Sato ;; Hironobu Takahashi , @@ -13,9 +13,7 @@ ;; SKK Development Team ;; ;; Maintainer: SKK Development Team -;; Version: $Id: SKK-JISYO.L,v 1.1216 2014/12/13 00:10:02 czkmt Exp $ ;; Keywords: japanese -;; Last Modified: $Date: 2014/12/13 00:10:02 $ ;; ;; This dictionary is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -669,7 +667,7 @@ ¤è¤¤¤Ä¤Ör /¿ì¤¤ÄÙ/ ¤è¤¤¤Ã¤Ñr /¾¬¤ÃÄ¥/ ¤è¤¤¤·r /¿ì¤¤ÃÔ/ -¤è¤¤¤¶m /¿ì¤¤³Ð;/¿ì¤¤ÀÃ/¿ìÀÃ/ +¤è¤¤¤¶m /¿ì¤¤³Ð/¿ì¤¤ÀÃ/¿ìÀÃ/ ¤è¤¤¤´s /¾¬±Û/ ¤è¤¢¤ëk /ÌëÊâ/ ¤è¤¢¤½b /ÌëÍ·/ @@ -16076,7 +16074,7 @@ #d /#0Æü/ #door /#0¥É¥¢/#1¥É¥¢/ #f /#0³¬/#1£Æ/#1³¬/ -#feet /(skk-gadget-units-conversion "feet" (string-to-number (car skk-num-list)) "cm")/ +#feet /#1¥Õ¥£¡¼¥È/ #fu /#9Êâ/ #g /#0G/#1¥®¥¬/ #gatu /#1·î/ @@ -16089,7 +16087,7 @@ #hi /#9Èô/ #hisha /#9Èô¼Ö/ #hu /#9Êâ/ -#inch /#1¥¤¥ó¥Á/(skk-gadget-units-conversion "inch" (string-to-number (car skk-num-list)) "cm")/(skk-gadget-units-conversion "inch" (string-to-number (car skk-num-list)) "feet")/ +#inch /#1¥¤¥ó¥Á/ #ji /#1»þ/ #k /#0¶â/ #ka /#1Æü/ @@ -16104,7 +16102,7 @@ #m#d /#0·î#0Æü/ #mega /#1¥á¥¬/ #mei /#1̾/ -#mile /(skk-gadget-units-conversion "mile" (string-to-number (car skk-num-list)) "km")/(skk-gadget-units-conversion "mile" (string-to-number (car skk-num-list)) "yard")/ +#mile /#1¥Þ¥¤¥ë/ #min /#0ʬ/ #mm /#1£í£í/#2£í£í/ #narigin /#9À®¶ä/ @@ -16120,10 +16118,9 @@ #t /#1£ô/#0ÄÚ/ #to /#9¤È/ #uma /#9ÇÏ/ -#x# /(skk-times)/ #y /#0ǯ/ #y#m#d /#0ǯ#0·î#0Æü/ -#yard /(skk-gadget-units-conversion "yard" (string-to-number (car skk-num-list)) "cm")/(skk-gadget-units-conversion "yard" (string-to-number (car skk-num-list)) "feet")/ +#yard /#1¥ä¡¼¥É/ #yen /#1±ß/#0±ß/#8±ß/ #¡¢# /#1¡¢#1/ #¡¢#¤Æ¤ó /#1¡¢#1ÅÀ/ @@ -19316,7 +19313,7 @@ baobab / baptisma /¥Ð¥×¥Æ¥¹¥Þ/ baptist /¥Ð¥×¥Æ¥¹¥È/¥Ð¥×¥Æ¥£¥¹¥È/ baptiste /¥Ð¥×¥Æ¥£¥¹¥È/¥Ð¥Æ¥£¥¹¥È/ -bar /¥Ð¡¼/¥Ð¡¼¥ë;-¤Î¤è¤¦¤Ê¤â¤Î/¡Ý;minus/¡Ã;pipe/¡Â/(make-string (- fill-column 1) ?-)/ +bar /¥Ð¡¼/¥Ð¡¼¥ë;-¤Î¤è¤¦¤Ê¤â¤Î/¡Ý;minus/¡Ã;pipe/¡Â/ barabbas /¥Ð¥é¥Ð/ baraja /¥Ð¥é¥Ï/ barb /¥Ð¡¼¥Ö/ @@ -33984,7 +33981,7 @@ november / novice /¥Î¡¼¥Ó¥¹/ novo /¥Î¥Ü/ novosibirsk /¥Î¥Ü¥·¥Ó¥ë¥¹¥¯/¥Î¥ô¥©¥·¥Ó¥ë¥¹¥¯/ -now /¥Ê¥¦/(current-time-string)/(substring (current-time-string) 11 16)/(substring (current-time-string) 11 19)/ +now /¥Ê¥¦/ nowait /¥Î¡¼¥¦¥§¥¤¥È/¥Î¡¼¥¦¥¨¥¤¥È/ nox /¥Î¥Ã¥¯¥¹/ÃâÁÇ»À²½Êª/ nozzle /¥Î¥º¥ë/ @@ -36477,7 +36474,6 @@ putting / puyol /¥×¥¸¥ç¡¼¥ë/ puzzle /¥Ñ¥º¥ë/ puzzlegame /¥Ñ¥º¥ë¥²¡¼¥à/ -pwd /(pwd)/ pygmalion /¥Ô¥°¥Þ¥ê¥ª¥ó/ pygmy /¥Ô¥°¥ß¡¼/ pyjamas /¥Ñ¥¸¥ã¥Þ/ @@ -39142,7 +39138,7 @@ skiresort / skirt /¥¹¥«¡¼¥È/ skit /¥¹¥­¥Ã¥È/ skiware /¥¹¥­¡¼¥¦¥§¥¢/ -skk /SKK/(skk-version)/Simple Kana to Kanji conversion program/ +skk /SKK/Simple Kana to Kanji conversion program/ skolem /¥¹¥³¡¼¥ì¥à/ skopje /¥¹¥³¥Ô¥¨/ skryabin /¥¹¥¯¥ê¥ã¡¼¥Ó¥ó/ @@ -40970,6 +40966,7 @@ testosterone / testpattern /¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó/ testrun /¥Æ¥¹¥È¥é¥ó/ testset /¥Æ¥¹¥È¥»¥Ã¥È/ +tethering /¥Æ¥¶¥ê¥ó¥°/ tetra /¥Æ¥È¥é;4/ tetrachloroethylene /¥Æ¥È¥é¥¯¥í¥í¥¨¥Á¥ì¥ó;C2Cl4/ tetris /¥Æ¥È¥ê¥¹/ @@ -41206,7 +41203,7 @@ tim / timbales /¥Æ¥£¥ó¥Ð¥ì¥¹/ timber /¥Æ¥£¥ó¥Ð¡¼/ timbre /¥¿¥ó¥Ö¥ë/ -time /¥¿¥¤¥à/»þ´Ö/(current-time-string)/ +time /¥¿¥¤¥à/»þ´Ö/ timeattack /¥¿¥¤¥à¥¢¥¿¥Ã¥¯/ timecapsule /¥¿¥¤¥à¥«¥×¥»¥ë/ timecard /¥¿¥¤¥à¥«¡¼¥É/ @@ -41300,7 +41297,7 @@ tocopherol / tocotrienol /¥È¥³¥È¥ê¥¨¥Î¡¼¥ë/ tocqueville /¥È¥¯¥ô¥£¥ë/ tod /¥È¥Ã¥É/¥È¡¼¥È;(ÆÈ) »à/ -today /¥È¥¥¥Ç¥¤/¥È¥¥¥Ç¥£/¥È¥¥¥Ç¡¼/(skk-current-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information nil 0 'gengo 0 0 0)))/(skk-current-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%s-%s-%s(%s)" 0 nil 0 0 nil)))/(skk-current-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information nil 0 'gengo 1 0 0)))/(skk-current-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information nil 3 'gengo 0 0 0)))/(skk-current-date)/ +today /¥È¥¥¥Ç¥¤/¥È¥¥¥Ç¥£/¥È¥¥¥Ç¡¼/ toe /¥È¥¥/¥È¥¦/¥È¡¼/ toeic /¥È¡¼¥¤¥Ã¥¯;Test of English for International Communication/TOEIC/ toeplitz /¥Æ¥×¥ê¥Ã¥Ä/ @@ -42379,7 +42376,7 @@ verre / versace /¥ô¥§¥ë¥µ¡¼¥Á;ww.versace.com/¥Ù¥ë¥µ¡¼¥Á/ versailles /¥Ù¥ë¥µ¥¤¥æ/¥ô¥§¥ë¥µ¥¤¥æ/ verse /¥ô¥¡¡¼¥¹;²Î»ì/ -version /¥Ð¡¼¥¸¥ç¥ó/¥ô¥¡¡¼¥¸¥ç¥ó/ÈÇ/(skk-version)/ +version /¥Ð¡¼¥¸¥ç¥ó/¥ô¥¡¡¼¥¸¥ç¥ó/ÈÇ/ version-up /¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×/ versionup /¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×/¥ô¥¡¡¼¥¸¥ç¥ó¥¢¥Ã¥×/ versus /¥Ð¡¼¥µ¥¹/¥ô¥¡¡¼¥µ¥¹/ @@ -45055,6 +45052,7 @@ zyklus / ¤¢¤¹¤«¤Ö¤ó¤« /ÈôĻʸ²½/ ¤¢¤¹¤«¤ä¤Þ /ÈôÄ»»³/ ¤¢¤¹¤± /­½õ/ +¤¢¤¹¤±¤«¤ó¤Á¤ã /­½õ´¨Ãã/ ¤¢¤¹¤³ /Èà½ê/ ¤¢¤¹¤³¤ë¤Ó¤ó¤µ¤ó /¥¢¥¹¥³¥ë¥Ó¥ó»À/ ¤¢¤¹¤¸¤å¤¦ /ÌÀÆüÃæ/ @@ -46601,7 +46599,7 @@ zyklus / ¤¢¤ó¤È¤¦ /°ÂÅì/°ÅÆ®/ ¤¢¤ó¤È¤¯ /°ÂÆÁ/ ¤¢¤ó¤È¤¯¤Æ¤ó¤Î¤¦ /°ÂÆÁÅ·¹Ä/ -¤¢¤ó¤É /°ÂÅÈ/ +¤¢¤ó¤É /°ÂÅÈ/¢Á/¢Ê/ ¤¢¤ó¤É¤¦ /°ÂÆ£/°ÂÅì/ ¤¢¤ó¤É¤¦¤·¤ç¤¦¤¨¤­ /°ÂÆ£¾»±×/ ¤¢¤ó¤É¤¦¤Ç¤ó¤­ /°ÂÆ£Åŵ¤/ @@ -46791,7 +46789,7 @@ zyklus / ¤¤¤¤¤è¤¦ /¸À¤¤ÍÍ;¾¤Ë¤â¤Ã¤È-¤â¤¢¤ë¤À¤í¤¦/ ¤¤¤¤¤ï¤± /¸À¤¤Ìõ/¸ÀÌõ/ ¤¤¤¤¤ï¤¿¤· /¸À¤¤ÅϤ·/¸ÀÅϤ·/ -¤¤¤¤¤ó /°Ñ°÷/°å±¡/°å°÷/ +¤¤¤¤¤ó /°Ñ°÷/°å±¡/°å°÷/°ËÕú/ ¤¤¤¤¤ó¤«¤¤ /°Ñ°÷²ñ/ ¤¤¤¤¤ó¤«¤¤¤¢¤ó /°Ñ°÷²ñ°Æ/ ¤¤¤¤¤ó¤«¤¤¤«¤ó¤ê /°Ñ°÷²ñ´ÉÍý/ @@ -47310,7 +47308,7 @@ zyklus / ¤¤¤²¤ó¤´ /°Û¸À¸ì/ ¤¤¤²¤ó¤Ó¤ç¤¦ /°å¸¶ÉÂ/ ¤¤¤³ /°Í×à/°ä¸É/ -¤¤¤³¡¼¤ë /¡á;equal/ +¤¤¤³¡¼¤ë /¡á;equal/¢â/¡â/ ¤¤¤³¤¤ /·Æ¤¤/·Æ/ ¤¤¤³¤¦ /°Ê¹ß/°Ü¹Ô/°Õ¸þ/°ä¹½/°ä¹Æ/°Ò¸÷/°Ü¹à/°á·å/°Î¸ù/°Û¹á/°Î¸ú/°ß¹Ð/°Ý¹Ë/ ¤¤¤³¤¦¤¢¤ó /°Ü¹Ô°Æ/ @@ -49362,7 +49360,6 @@ zyklus / ¤¤¤Ä¤¸ /°ï»ö/íÅ»ö/ ¤¤¤Ä¤¾¤ó¤½¤¦¤·¤ç /ПÁѽñ/ ¤¤¤Ä¤À¤Ä /°ïæ/ -¤¤¤Ä¤Á¤ç¤¦¤é /°ìÄ¥Íå/ ¤¤¤Ä¤Ä /¸Þ¤Ä/£µ¤Ä/5¤Ä/ ¤¤¤Ä¤Ä¤Ð¤· /¸Þ¶¶/ ¤¤¤Ä¤Ä¤Ü¤· /¸Þ¤ÄÀ±;¡ù¡ù¡ù¡ù¡ù ¡Ö-¥ì¥¹¥È¥é¥ó¡×/ @@ -51151,6 +51148,7 @@ zyklus / ¤¦¤­¤ß /É⤭¿È;¢÷¡Ö¥×¡¼¥ë¤Ç-¡×/Éâ¿È/É⤭¼Â;¢÷¡Ö¥¹¡¼¥×¤Î-¡×/Í«¤­¿È;¢÷¡Ö-¤òãह¡×/ ¤¦¤­¤á /Í«¤­ÌÜ/ ¤¦¤­¤ç¤¦ /±¦µþ/ +¤¦¤­¤ç¤¦¤¯ /±¦µþ¶è/ ¤¦¤­¤ç¤¦¤·¤­ /±¦µþ¿¦;[ΧÎáÀ©]¼ë¿ýÂçÏ©Å즤ιÔÀ¯Ã´Åö/ ¤¦¤­¤ç¤¦¤Î¤À¤¤¤Ö /±¦µþÂçÉ×;[ΧÎáÀ©]±¦µþ¿¦¤ÎĹ´±/ ¤¦¤­¤ç¤¯ /±ª¶Ê/ @@ -54521,6 +54519,7 @@ zyklus / ¤ª¡¼¤ä¤ó¤Õ¤£¤Õ¤£ /²¤ÍÛèËèË/ ¤ª¡¼¤ë¤¹¤¿¡¼¤»¤ó /¥ª¡¼¥ë¥¹¥¿¡¼Àï/ ¤ª¡¼¤ì /£Ï£Ò£Å/ +¤ª¤¢ /¢À/¢Ë/ ¤ª¤¢¤¤¤½ /¤ª°¦ÁÛ/ ¤ª¤¢¤¤¤Æ /¤ªÁê¼ê/¸æÁê¼ê/ ¤ª¤¢¤¤¤Ë¤¯¤µ¤Þ /¸æÀ¸ÁþÍÍ/ @@ -55126,6 +55125,7 @@ zyklus / ¤ª¤ª¤¨¤»¤ó¤ê /Âç¹¾ÀéΤ/ ¤ª¤ª¤¨¤Á¤ç¤¦ /Â繾Į/ ¤ª¤ª¤¨¤É /Âç¹¾¸Í/ +¤ª¤ª¤¨¤É¤»¤ó /Âç¹¾¸ÍÀþ/ ¤ª¤ª¤¨¤É¤½¤¦¤µ¤â¤¦ /Âç¹¾¸ÍÁܺºÌÖ/ ¤ª¤ª¤¨¤É¤Ï¤Ê¤Ó /Âç¹¾¸Í²Ö²Ð/ ¤ª¤ª¤¨¤Î¤­ /Âç±Ý/ @@ -63405,12 +63405,12 @@ zyklus / ¤«¤ß¤­¤¿ /¾åËÌ/ ¤«¤ß¤­¤¿¤¶¤ï /¾åËÌÂô/ ¤«¤ß¤­¤¿¤ä¤Þ /¾åËÌ»³/ -¤«¤ß¤­¤ç¤¦¤¯ /¾åµþ¶è/ ¤«¤ß¤­¤ê /ȱÀÚ¤ê/ ¤«¤ß¤­¤ê¤à¤· /Å·µí/ȱÀÚÃî/ ¤«¤ß¤­¤ì /»æÀÚ¤ì/»æÀÚ/ ¤«¤ß¤®¤· /¿À´ß;À«/ ¤«¤ß¤®¤ç¤¦ /¾åµþ/ +¤«¤ß¤®¤ç¤¦¤¯ /¾åµþ¶è/ ¤«¤ß¤®¤ì /»æÀÚ¤ì/ ¤«¤ß¤®¤ï /ȱºÝ;À¸¤¨ºÝ/ ¤«¤ß¤¯¤¤¤·¤­ /¾å¶å°ì¿§/ @@ -70803,6 +70803,7 @@ zyklus / ¤­¤ç¤¦¤¨¤¤¤·¤ç¤¯¤Ö¤Ä /¶¦±É¿¢Êª;[±à·Ý]companion plants/ ¤­¤ç¤¦¤¨¤¤¤¿¤ó¤«¡¼ /¶¦±É¥¿¥ó¥«¡¼/ ¤­¤ç¤¦¤¨¤¤¤É¤¦ /¶¦±ÉƲ/ +¤­¤ç¤¦¤¨¤¤¤ß¤º¤® /¶¥±Ë¿åÃå/ ¤­¤ç¤¦¤¨¤¤¤â¤¸ /¶À±Çʸ»ú/ ¤­¤ç¤¦¤¨¤­ /¶¦±×/¶¦Ìò;¢¨¤­¤ç¤¦¤ä¤¯¤Î¸í¤ê?/ ¤­¤ç¤¦¤¨¤­¤±¤ó /¶¦±×¸¢/ @@ -72780,7 +72781,7 @@ zyklus / ¤­¤ó¤·¤ó¤·¤å¤¦¤³¤¦ /¶Ó¿´½«¸ý/ ¤­¤ó¤·¤ó¤½¤¦¤«¤ó /¶á¿ÆÁê´¯/ ¤­¤ó¤·¤ó¤¾¤¦¤ª /¶á¿ÆÁþ°­/ -¤­¤ó¤¸ /¶á»÷/¶á»þ;recent/¶âÃÏ/¶â»ú/¶á»ø;valet/¶á»ö/¶ÕÆó/¶â¼¡/¶â¼£/¶Ö»Ê/¶Ø»ù/ +¤­¤ó¤¸ /¶á»÷/¢â/¶á»þ;recent/¶âÃÏ/¶â»ú/¶á»ø;valet/¶á»ö/¶ÕÆó/¶â¼¡/¶â¼£/¶Ö»Ê/¶Ø»ù/ ¤­¤ó¤¸> /¶á»÷;-²ò,-´Ø¿ô/ ¤­¤ó¤¸¤«¤¤ /¶á»÷²ò/ ¤­¤ó¤¸¤«¤¤¤Û¤¦ /¶á»÷²òË¡/ @@ -72962,7 +72963,7 @@ zyklus / ¤­¤ó¤À¤¤¤»¤ó /¶áÂçÀï/ ¤­¤ó¤À¤¤¤Á /¶âÅÄ°ì/ ¤­¤ó¤À¤¤¤Á¤­¤ç¤¦¤¹¤± /¶âÅÄ°ìµþ½õ/ -¤­¤ó¤À¤¤¤Á¤³¤¦¤¹¤± /¶âÅÄ°ì¹Ì²ð/ +¤­¤ó¤À¤¤¤Á¤³¤¦¤¹¤± /¶âÅÄ°ì¹Ì½õ/ ¤­¤ó¤À¤¤¤Á¤Ï¤ë¤Ò¤³ /¶âÅÄ°ì½Õɧ/ ¤­¤ó¤À¤¤¤Æ¤­ /¶áÂåŪ/ ¤­¤ó¤À¤¤¤È¤· /¶áÂåÅÔ»Ô/ @@ -76850,7 +76851,7 @@ zyklus / ¤±¤¤¤µ¤Ä¤è¤¦¤´ /·Ù»¡ÍѸì/ ¤±¤¤¤µ¤Ä¤è¤Ó¤¿¤¤ /·Ù»¡Í½È÷Ââ/ ¤±¤¤¤µ¤Ä¤ê¤ç¤¯ /·Ù»¡ÎÏ/ -¤±¤¤¤µ¤ó /·×»»/·Ð»º/·¾»À/ +¤±¤¤¤µ¤ó /·×»»/·Ð»º/·¾»À/¡æ/¡à/¡Þ/¡ß/¡Ü/¡á/¡â/¡ã/¡å/¡ä/ ¤±¤¤¤µ¤ó¤¨¤ó /·¾»À±ö/ ¤±¤¤¤µ¤ó¤«¤¤¤¹¤¦ /·×»»²ó¿ô/ ¤±¤¤¤µ¤ó¤«¤¬¤¯ /·×»»²Ê³Ø;¢÷computational SCIENCE/·×»»²½³Ø;¢÷computational CHEMISTRY/ @@ -79122,6 +79123,7 @@ zyklus / ¤±¤ó¤ê¤ç /¸­Î¸/ ¤±¤ó¤ê¤ç¤¦ /¸¡ÎÌ/¸«ÎÁ/ ¤±¤ó¤ê¤ç¤¦¤·¤Ä /¸¡Î̼¼/ +¤±¤ó¤ê¤ç¤¦¤»¤ó /¸¡ÎÌÀþ/ ¤±¤ó¤ê¤ç¤¯ /¸¢ÎÏ/ ¤±¤ó¤ê¤ç¤¯¤¢¤é¤½¤¤ /¸¢ÎÏÁ褤/ ¤±¤ó¤ê¤ç¤¯¤« /¸¢Îϲ¼/ @@ -87591,7 +87593,6 @@ zyklus / ¤µ¤¤¤­¤ç /ºÛµö/ºÆµó/ ¤µ¤¤¤­¤ç¤¦ /ºÇ¶¯/À¾µþ;µþÅÔ/ºëµþ;ºë¶Ì¡ÁÅìµþ/ºÐ·º;[±¢ÍÛÆ»]Ȭ¾­¿À¤Î°ì¡£¿åÀ±/ ¤µ¤¤¤­¤ç¤¦¤¤¤¯ /ºÆ¶µ°é/ -¤µ¤¤¤­¤ç¤¦¤¯ /À¾µþ¶è/ ¤µ¤¤¤­¤ç¤¦¤»¤Ä /ºÇ¶¯Àâ/ ¤µ¤¤¤­¤ç¤¦¤»¤ó /ºëµþÀþ/ ¤µ¤¤¤­¤ç¤¦¤»¤ó¤«¤¤¤½¤¯ /ºëµþÀþ²÷®/ @@ -90318,7 +90319,7 @@ zyklus / ¤µ¤ó¤«¤­¤ó /»²²Ã¶â/ ¤µ¤ó¤«¤­¤ó¤¿¤¤ /»³²Ï¶ßÂÓ/ ¤µ¤ó¤«¤®¤ó¤Ç¤ó¤Á /»À²½¶äÅÅÃÓ;[²½³Ø]/ -¤µ¤ó¤«¤¯ /»°³Ñ/»²²è/¢¤/¢¦/¢¥/¢§/ìÕáÁ;µì»ú/3³Ñ/ +¤µ¤ó¤«¤¯ /»°³Ñ/»²²è/¢¤/¢¦/¢¥/¢§/¡è/¢è/ìÕáÁ;µì»ú/3³Ñ/ ¤µ¤ó¤«¤¯¤¤¤¿ /»°³ÑÈÄ/ ¤µ¤ó¤«¤¯¤« /»°³Ñ²½/ ¤µ¤ó¤«¤¯¤«¤ó¤±¤¤ /»°³Ñ´Ø·¸/ @@ -92079,6 +92080,7 @@ zyklus / ¤·¤ª¤Î¤® /±öÌîµÁ/ ¤·¤ª¤Î¤®¤»¤¤¤ä¤¯ /±öÌîµÁÀ½Ìô;[´ë¶È̾]/ ¤·¤ª¤Î¤ß¤µ¤­ /Į̆/ +¤·¤ª¤Î¤ß¤Á /±ö¤ÎÆ»;Àé¹ñ³¹Æ»/ ¤·¤ª¤Î¤ä /±öë/ ¤·¤ª¤Ï¤Þ /±öÉÍ/ ¤·¤ª¤Ï¤é /±ö¸¶/ @@ -94707,6 +94709,7 @@ zyklus / ¤·¤â¤­¤¿¤Ï¤ó¤È¤¦ /²¼ËÌȾÅç/ ¤·¤â¤­¤¿¤ä¤Þ /²¼ËÌ»³/ ¤·¤â¤®¤ç¤¦ /²¼µþ/ +¤·¤â¤®¤ç¤¦¤¯ /²¼µþ¶è/ ¤·¤â¤¯ /»ÍÌÚ/ ¤·¤â¤¯¤Ë /²¼Ô¢/ ¤·¤â¤¯¤í¤«¤ï /²¼¹õÀî/ @@ -97463,7 +97466,6 @@ zyklus / ¤·¤å¤ó¤Ç¤¤ /½ÕÅ¥/ ¤·¤å¤ó¤Ç¤ó /½ÖÅÅ/ ¤·¤å¤ó¤È¤¦ /½ÕÆ®/ -¤·¤å¤ó¤È¤¦¤°¤ó /½ÙÅì·´/ ¤·¤å¤ó¤É¤¦ /êÁÆ°/½ÕÆ£/ ¤·¤å¤ó¤Ð /½ÙÇÏ/ ¤·¤å¤ó¤Ñ¤Ä¤ê¤ç¤¯ /½ÖȯÎÏ/ @@ -98743,7 +98745,7 @@ zyklus / ¤·¤ç¤¦¤í¤ó¤Ö¤ó¤Æ¤¤¤·¤å¤Ä /¾®ÏÀʸÄó½Ð/ ¤·¤ç¤¦¤í¤ó¤Ý¤¦ /¾®äÆÊñ/ ¤·¤ç¤¦¤ï /¾¼ÏÂ;ǯ¹æ(1926-1989)/ÀµÏÂ;ǯ¹æ(1312-1317)/¾®ÏÃ/¾±ÏÂ/¾§ÏÂ/¾ÐÏÃ/¾µÏÂ;ǯ¹æ(834-848)/ÐéÏÂ/ -¤·¤ç¤¦¤ï#¤Í¤ó /¾¼ÏÂ#0ǯ/¾¼ÏÂ#1ǯ/¾¼ÏÂ#2ǯ/¾¼ÏÂ#3ǯ/(skk-gengo-to-ad "" "ǯ")/(skk-gengo-to-ad "À¾Îñ" "ǯ")/ +¤·¤ç¤¦¤ï#¤Í¤ó /¾¼ÏÂ#0ǯ/¾¼ÏÂ#1ǯ/¾¼ÏÂ#2ǯ/¾¼ÏÂ#3ǯ/ ¤·¤ç¤¦¤ï¤«¤è¤¦¤· /¾¼Ï²ÎÍØ»Ë/ ¤·¤ç¤¦¤ï¤­ /¾¼Ï´ü/ ¤·¤ç¤¦¤ï¤­¤Á /¾¼Ï´ðÃÏ/ @@ -100856,7 +100858,7 @@ zyklus / ¤·¤ó¤·¤è¤¦ /¿Â»ÎÍÑ/¿·»ÅÍÍ/ ¤·¤ó¤·¤í /¿·¾ë/ ¤·¤ó¤·¤í¤¯ /¿Â»ÎÏ¿/ -¤·¤ó¤·¤ó /¿´¿È/¿·¿Ê/¿·¡¹/ÄÅ¡¹;¶½Ì£-/¿¼¡¹;À㤬-¤È¹ß¤ë/¿´¿À;mind.¡Ö-ÁÓ¼º¡×/ÄÅÄÅ/¿®¿´;¤·¤ó¤¸¤ó?/ +¤·¤ó¤·¤ó /¿´¿È/¿·¿Ê/¿·¡¹/ÄÅ¡¹;¶½Ì£-/¿¼¡¹;À㤬-¤È¹ß¤ë/¿´¿À;mind.¡Ö-ÁÓ¼º¡×/ÄÅÄÅ/¿®¿´;¤·¤ó¤¸¤ó?/¿­¿È/ ¤·¤ó¤·¤ó¤­¤¨¤¤ /¿·¿Êµ¤±Ô/ ¤·¤ó¤·¤ó¤³¤¦¤¸¤ã¤¯ /¿´¿ÀÌ×¼å/ ¤·¤ó¤·¤ó¤µ¤Ã¤« /¿·¿Êºî²È/ @@ -100946,6 +100948,7 @@ zyklus / ¤·¤ó¤¸¤í¤¦ /¿·¼¡Ïº/¿µ¼¡Ïº/ ¤·¤ó¤¸¤ó /¿·¿Í/¿®¿´/¿¼¿Ó/¿³¿Ò/¿À¿Í/¿¿¿Í/¿³¿Ö;=¿³¿Ò/ ¤·¤ó¤¸¤ó¤¨¤ó¤²¤¤¤¿¤¤¤·¤ç¤¦ /¿·¿Í±é·ÝÂç¾Þ/ +¤·¤ó¤¸¤ó¤ª¤¦ /¿·¿Í²¦/ ¤·¤ó¤¸¤ó¤« /¿®¿´²È/ ¤·¤ó¤¸¤ó¤«¤·¤å /¿·¿Í²Î¼ê/ ¤·¤ó¤¸¤ó¤­¤·¤å /¿·¿Íµ³¼ê/ @@ -103587,7 +103590,7 @@ zyklus / ¤¸¤É¤¦¤í¤¯¤¬ /¼«Æ°Ï¿²è/ ¤¸¤É¤¦¤í¤³¤¦ /¼«Æ°Ïª¸÷/ ¤¸¤É¤¦¤í¤·¤å¤Ä /¼«Æ°Ïª½Ð/ -¤¸¤É¤ê /ÃÏ·Ü/Ãϼè¤ê/ +¤¸¤É¤ê /ÃÏ·Ü/Ãϼè¤ê/¼«»£¤ê;¼«Ê¬»£¤ê(selfie)/ ¤¸¤Ê¤¤ /ÃÏÆâ/»ûÆâ/¼ªÆâ/ ¤¸¤Ê¤¤¤Á¤ç¤¦ /»ûÆâÄ®/ ¤¸¤Ê¤é¤· /Ã϶Ѥ·/ @@ -105348,6 +105351,7 @@ zyklus / ¤¸¤ç¤¦ /¾å/¾ð/¾û/¾ì/¾õ/¾è/¾ò/¾î/¾ö/Ä¡/¾ë/¾ï/Ƚ´±;[ΧÎáÀ©]/°Ó;[ΧÎáÀ©](¸Þ±ÒÉܤÇ)=Ƚ´±/¾æ;10¼Ü/¾ó;¤Ä¤¨/п;µ·¾óʼ/¾í;ÅÚ¾í/¾÷;Ë­¾÷/¾ù;¾ùÅÏ/¾ú;¾úÀ®/Ôá;¡Ö¾í¡×¤Îµì»ú/ÕÐ;¡Ö¾î¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/Ú·;º¹ÄÚ·°Ð/ãº;(¤Ï¤é¤¦)/ê÷/ñè/ãÕ;¡Ö¾÷¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/ìª;¡Ö¾ù¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/îÖ;¡Ö¾ú¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/¾ô;¾ô²½/ÀÅ;ÀÅÌ®/ÆÔ;¤È¤í/ÞÆ;¡Ö¾ô¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/ðÐ;¡ÖÀšפεì»ú(¿Í̾ÍÑ´Á»ú)/¾ê;²á¾ê/Ñô;¡Ö¾ê¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/Ы;¡Ö¾è¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/Äê;°Æ¤ÎÄê/ëÜ;ļëÜ/¾ç;¾çÁê/¾ø;¾øα/ÙÎ/ßß/åå;°Ïåå/î­;¢âåå/èý;¤­¤³¤ê/ñÁ;ñÁÀå/Þþ;ÀöÞþ/å¶;å¶Ãî(=¾òÃî)/Ûê;¡Ö¾ò¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/Âû;¤­¤Î¤³/æã;¢âÓñ/íº;(¤Õ¤à)/¾é;¾éÃÌ/¾ñ;¾ñÍð/̼/л;¤Ê¤ª/Õ¾;¤¿¤ª¡¦¤ä¤«/ÕË;¤Ê¤Ö¡¦¤ë/ê¬;¤â¤ß?/Æì;Æìʸ/åê;¡ÖÆì¡×¤Îµì»ú/ÔÇ;¡Ö¾ì¡×¤Î°ÛÂλú/áÈ;¡Ö¾ö¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/áÉ;¡Ö¾ö¡×¤Îµì»ú2/áÊ;¡Ö¾ö¡×¤Îµì»ú3/Äç;(´·ÍѲ»)Äç±Ê¼°ÌÜ/À®;(¸â²»)À®Ê©/À¹;(¸â²»)ÈËÀ¹/À¸/À±;ÌÀÀ±/ ¤¸¤ç¤¦> /¾å/̼;̼¸ì,̼ºÙ˦/ ¤¸¤ç¤¦¤¢¤¤ /¾ð°¦/¾ð¹ç/ +¤¸¤ç¤¦¤¢¤Ä /¾ï°µ/ ¤¸¤ç¤¦¤¤ /¾å°Ì/Ú·°Ð/¾ð°Õ/¾ù°Ì/¾å°Õ;-²¼Ã£/¾å°á/¾å°å/ ¤¸¤ç¤¦¤¤> /¾å°Ì;-³µÇ°,-ʬÌî,-¥Ó¥Ã¥È/ ¤¸¤ç¤¦¤¤¤¦¤Á /¾å°ÕƤ¤Á/ @@ -108764,6 +108768,7 @@ zyklus / ¤¹¤ó¤Æ¤Ä /À£Å´/ ¤¹¤ó¤Ç /´û/ ¤¹¤ó¤È¤¦ /½ÙÅì/ +¤¹¤ó¤È¤¦¤°¤ó /½ÙÅì·´/ ¤¹¤ó¤É /À£ÅÚ/ ¤¹¤ó¤É¤á /À£»ß¤á/ ¤¹¤ó¤Ë¡¼¤Ï /¥¹¥ó¥Ë¡¼ÇÉ/ @@ -110807,7 +110812,7 @@ zyklus / ¤»¤¤¤ì¤¤¤Æ¤ó /À»Îéŵ/ ¤»¤¤¤ì¤¤¤È¤· /À¯ÎáÅÔ»Ô/ ¤»¤¤¤ì¤­ /À¾Îñ/ -¤»¤¤¤ì¤­#¤Í¤ó /À¾Îñ#0ǯ/À¾Îñ#1ǯ/À¾Îñ#2ǯ/À¾Îñ#3ǯ/(skk-ad-to-gengo 0 nil "ǯ")/(skk-ad-to-gengo 1 nil "ǯ")/ +¤»¤¤¤ì¤­#¤Í¤ó /À¾Îñ#0ǯ/À¾Îñ#1ǯ/À¾Îñ#2ǯ/À¾Îñ#3ǯ/ ¤»¤¤¤ì¤­¤Ê¤ó¤Í¤ó /À¾Îñ²¿Ç¯/ ¤»¤¤¤ì¤­¤Í¤ó¤¬¤Ã¤Ô /À¾Îñǯ·îÆü/ ¤»¤¤¤ì¤Ä /À°Îó;line up/À¶ÑØ;limpid/À±Îó/ @@ -112168,7 +112173,7 @@ zyklus / ¤»¤ó¤±¤Ä¤´¤¦ /Àþ·ë¹ç/ ¤»¤ó¤±¤Ä¤¸¤³¤¦ /Àì·è»ö¹à/ ¤»¤ó¤±¤Ä¤Ï¤ó¤Î¤¦ /Àø·ìÈ¿±þ/ -¤»¤ó¤±¤ó /À踯/À踫/À츢/À踳/Àõ¸«/Þɸ«;¡ÖÀõ¡×µì»ú/Àè·ï/ÕÉÕ¯;-¤¿¤ëÈþ½÷/Àç·ú/Ú£¸¢/Áª¸¦/Áª¹ÛÀºÏ£¸¦µæ½ê;¢¨abbrev/ +¤»¤ó¤±¤ó /À踯/À踫/À츢/À踳/Àõ¸«/Þɸ«;¡ÖÀõ¡×µì»ú/Àè·ï/ÕÉÕ¯;-¤¿¤ëÈþ½÷/Àç·ú/Ú£¸¢/Áª¸¦/Áª¹ÛÀ½Ï£¸¦µæ½ê;¢¨abbrev/ ¤»¤ó¤±¤ó¤µ¤½¤¦¤Á /Àþ¸¡ººÁõÃÖ/ ¤»¤ó¤±¤ó¤¸¤³¤¦ /À츢»ö¹à/ ¤»¤ó¤±¤ó¤»¤¤ /À踫À­/ @@ -113415,7 +113420,7 @@ zyklus / ¤¼¤ó /Á±/Á°/Á´/Á·;¤ª-/Áµ;Zen Buddhism/Á³/Àé;(Ï¢Âù)/ÑÇ/çò/ñù;¤Ò¤²¡£ò¤ñù/ÓÃ;Óé/êÀ;êÀÆ°/Á²;Á²¼¡/ÖÐ/Á¶;½¤Á¶/æÁ;¡ÖÁ±¡×¤Î°ÛÂλú/Àæ;¤»¤ß/ã¸;¡ÖÁµ¡×¤Îµì»ú(¿Í̾ÍÑ´Á»ú)/ ¤¼¤ó> /Á°/Á´/ ¤¼¤ó¤¢¤¯ /Á±°­/ -¤¼¤ó¤¢¤Ä /Á°°µ/ +¤¼¤ó¤¢¤Ä /Á°°µ/Á´°µ/ ¤¼¤ó¤¤ /Á±°Õ/Á°°Ì/Áµ°Ì/ ¤¼¤ó¤¤¤¤¤ó /Á´°Ñ°÷/ ¤¼¤ó¤¤¤­ /Á´°è/ @@ -117112,7 +117117,7 @@ zyklus / ¤¿¤¤¤·¤ç /Âнè/Âà½ê;¢ÎÆþ½ê/Âç½ñ/Âç½ë;[Æó½½»ÍÀᵤ]7.23º¢/Âç½ê/ÂÀ½é/ÂÐí¨;¤¿¤¤¤»¤­/Âæ½ñ/ ¤¿¤¤¤·¤ç¤¢¤ó /Âнè°Æ/ ¤¿¤¤¤·¤ç¤¦ /ÂоÝ;¢÷target.¡Ö¸¦µæ-¡×/ÂçÀµ;ǯ¹æ(1912-26)/Âç¾Þ/Âç¾­/ÂоÈ;¢÷contrast.¡Ö-¼Â¸³¡×/ÂоÎ;¢÷symmetry.¡ÖÀþ-¡×/Â羡/Âç¾Ð/ÂоÉ;-ÎÅË¡/Â⾦/Âç¾¹;¢âÂ羡/Âç¾Û/ÂÛÀ¸;[Ê©¶µ]/ -¤¿¤¤¤·¤ç¤¦#¤Í¤ó /ÂçÀµ#0ǯ/ÂçÀµ#1ǯ/ÂçÀµ#2ǯ/ÂçÀµ#3ǯ/(skk-gengo-to-ad "" "ǯ")/(skk-gengo-to-ad "À¾Îñ" "ǯ")/ +¤¿¤¤¤·¤ç¤¦#¤Í¤ó /ÂçÀµ#0ǯ/ÂçÀµ#1ǯ/ÂçÀµ#2ǯ/ÂçÀµ#3ǯ/ ¤¿¤¤¤·¤ç¤¦> /ÂоÝ;-·²,-¹Ô,-ÃÄÂÎ/ ¤¿¤¤¤·¤ç¤¦¤¤¤± /ÂçÀµÃÓ/ ¤¿¤¤¤·¤ç¤¦¤¨¤Ó /ÂçÀµ³¤Ï·/ @@ -123708,7 +123713,6 @@ zyklus / ¤Á¤å¤¦¤­¤å¤¦¤Ø¤ó /ÃæµéÊÔ/ ¤Á¤å¤¦¤­¤ç¤¦ /Ãæµþ/Ã润/Ã涧/ ¤Á¤å¤¦¤­¤ç¤¦¤«¤¤¤µ¤¤ /Ãæµþ³«ºÅ/ -¤Á¤å¤¦¤­¤ç¤¦¤¯ /Ãæµþ¶è/ ¤Á¤å¤¦¤­¤ç¤¦¤±¤¤¤Ð¤¸¤ç¤¦ /Ãæµþ¶¥ÇϾì/ ¤Á¤å¤¦¤­¤ç¤¦¤·¤Ð /Ãæµþ¼Ç/ ¤Á¤å¤¦¤­¤ç¤¦¤·¤ó /Ã涵¿³;[ά¸ì]Ãæ±û¶µ°é¿³µÄ²ñ/ @@ -127373,6 +127377,7 @@ zyklus / ¤Ä¤ï¤Î /ÄÅÏÂÌî/ ¤Ä¤ï¤Ö¤­ /ÀÐÉù/ ¤Ä¤ï¤â¤Î /ʼ/¶¯¼Ô/ +¤Ä¤ï¤ê /°­ÁË/ ¤Ä¤ó¤É¤¯ /ÀÑÆÉ/ÀѤóÆÉ/ÀÑì¦;¡ÖÆɡ׵ì»ú/ ¤Ä¤ó¤Ü /ϸ/ ¤Ä¤ó¤Ü¤µ¤¸¤­ /ϸ»·Éß/ @@ -127747,6 +127752,7 @@ zyklus / ¤Æ¤¤¤·¤å¤¦¤Ï¤¹¤¦¤¤¤­ /Äã¼þÇÈ¿ô°è/ ¤Æ¤¤¤·¤å¤«¤ó¤Ñ¤¯ /Äâ¼ç´ØÇò/ ¤Æ¤¤¤·¤å¤¯ /Äç½Ê/ +¤Æ¤¤¤·¤å¤Ã¤· /Äã½Ð»ñ/ ¤Æ¤¤¤·¤å¤Ä /Äó½Ð/Äò½Ð;excel/ ¤Æ¤¤¤·¤å¤Ä¤­¤²¤ó /Äó½Ð´ü¸Â/ ¤Æ¤¤¤·¤å¤Ä¤´ /Äó½Ð¸å/ @@ -133759,6 +133765,7 @@ zyklus / ¤È¤è¤¸ /Ë­¼£/ ¤È¤è¤¹ /Ë­½§/ ¤È¤è¤¹¤¨¤­ /Ë­½§±Ø/ +¤È¤è¤¹¤·¤¸¤ç¤¦ /Ë­½§»Ô¾ì/ ¤È¤è¤¹¤Õ¤È¤¦ /Ë­½§ÉÖƬ/ ¤È¤è¤¿ /Ë­ÅÄ/ ¤È¤è¤¿¤± /Ë­ÃÝ;µÁÂÀÉפÎ̾À×/ @@ -135927,6 +135934,7 @@ zyklus / ¤Ê¤«¤­¤¿ /ÃæËÌ/ÃæÍèÅÄ/ ¤Ê¤«¤®¤· /Ãæ´ß/ ¤Ê¤«¤®¤ç¤¦ /Ãæµþ/ +¤Ê¤«¤®¤ç¤¦¤¯ /Ãæµþ¶è/ ¤Ê¤«¤®¤ê /Ãæ¶Í/Ãæ¸Â/ ¤Ê¤«¤¯ /Ãæ¶è/ ¤Ê¤«¤¯¤® /ÃæÅ£/ @@ -138070,11 +138078,11 @@ zyklus / ¤Ë¤·¤­¤Í /Ï°ð/ ¤Ë¤·¤­¤Î¤ß¤Ï¤¿ /¶Ó¤Î¸æ´ú/ ¤Ë¤·¤­¤ß /¶Ó¸«/ +¤Ë¤·¤­¤ç¤¦¤¯ /À¾µþ¶è/ ¤Ë¤·¤­¤ç¤¦¤´¤¯ /À¾µþ¶Ë/ ¤Ë¤·¤­¤ç¤¦¤´¤¯¤­¤å¤¦¤¸¤ç¤¦ /À¾µþ¶Ëµå¾ì/ ¤Ë¤·¤­¤ê¤å¤¦ /À¾¶ÍÀ¸/ ¤Ë¤·¤­¤ê¤å¤¦¤¨¤­ /À¾¶ÍÀ¸±Ø/ -¤Ë¤·¤®¤ç¤¦¤¯ /À¾µþ¶è/ ¤Ë¤·¤®¤ó¤¶ /À¾¶äºÂ/ ¤Ë¤·¤¯ /À¾¶è/ ¤Ë¤·¤¯¤¸¤ç¤¦ /À¾¶å¾ò/ @@ -140222,6 +140230,7 @@ zyklus / ¤Ë¤ó¤Á¤­¤³¤¦ /ǧÃε¡¹½/ ¤Ë¤ó¤Á¤­¤Î¤¦ /ǧÃε¡Ç½/ ¤Ë¤ó¤Á¤²¤ó¤´¤¬¤¯ /ǧÃθÀ¸ì³Ø/ +¤Ë¤ó¤Á¤·¤ç¤¦ /ǧÃξÉ/ ¤Ë¤ó¤Á¤·¤ç¤ê /ǧÃνèÍý/ ¤Ë¤ó¤Á¤·¤ó¤ê /ǧÃο´Íý/ ¤Ë¤ó¤Á¤·¤ó¤ê¤¬¤¯ /ǧÃο´Íý³Ø/ @@ -144351,7 +144360,6 @@ zyklus / ¤Ï¤Þ¤Ê¤« /ÉÍÃæ/ßÀÃæ;¡ÖÉ͡׵ì»ú/ ¤Ï¤Þ¤Ê¤³ /ÉÍ̾¸Ð/ ¤Ï¤Þ¤Ê¤³¤ª¤ª¤Ï¤· /ÉÍ̾¸ÐÂ綶/ -¤Ï¤Þ¤Ê¤³¤á¤¤¤µ¤ó /ÉÍ̾¸Ð̾»º/ ¤Ï¤Þ¤Ê¤· /ÉÍÍü;=¤Ï¤Þ¤Ê¤¹/ ¤Ï¤Þ¤Ê¤¹ /ÉͲػÒ/ÉÍÍü/ ¤Ï¤Þ¤Î /ÉÍÌî/ßÀÌî/ @@ -145654,7 +145662,6 @@ zyklus / ¤Ð /¾ì/ÇÏ/±©/ÍÕ/¿Ï/»õ/ÇÍ/ÇÌ/Äí/ÇÎ;ÇξÖ/ÔÇ;¡Ö¾ì¡×¤Î°ÛÂλú/Ñã;¡Ö¿Ï¡×¤Î°ÛÂλú/ ¤Ð¡¼¤¯¤ê¤¦¤à /Bk/Berkelium/ ¤Ð¡¼¤¸¤ã¡¼¤Ó¤ç¤¦ /¥Ð¡¼¥¸¥ã¡¼ÉÂ;[°å]Buerger's disease/ -¤Ð¡¼¤¸¤ç¤ó /(skk-version)/ ¤Ð¡¼¤¸¤ç¤ó¤Ð¤ó¤´¤¦ /¥Ð¡¼¥¸¥ç¥óÈÖ¹æ/ ¤Ð¡¼¤¹¤È¤¦ /¥Ð¡¼¥¹ÅÞ/ ¤Ð¤¢ /ÇÌ/ @@ -146042,7 +146049,7 @@ zyklus / ¤Ð¤Ã¤¯¤è¤é¤¯ /È´¶ìÍ¿³Ú/ ¤Ð¤Ã¤±¤ó /È´·õ/ ¤Ð¤Ã¤³ /ìíî½/ -¤Ð¤Ã¤µ¤¤ /ȲºÎ/ȲºÛ/ +¤Ð¤Ã¤µ¤¤ /ȲºÎ/ ¤Ð¤Ã¤µ¤Ä /È´ºþ/ ¤Ð¤Ã¤· /È´»õ/È´»å/Ëö»Ò/ ¤Ð¤Ã¤·¤¸ /È´»õ»þ/ @@ -146887,6 +146894,7 @@ zyklus / ¤Ò¤¬¤·¤â¤ó /ÅìÌç/ ¤Ò¤¬¤·¤ä¤Ä¤·¤í /ÅìȬÂå/ ¤Ò¤¬¤·¤ä¤Þ /Å컳/ +¤Ò¤¬¤·¤ä¤Þ¤¯ /Å컳¶è/ ¤Ò¤¬¤·¤ä¤Þ¤³ /Å컳¸Ð/ ¤Ò¤¬¤·¤ä¤Þ¤´¤¸¤ç¤¦ /Å컳¸Þ¾ò/ ¤Ò¤¬¤·¤ä¤Þ¤µ¤ó¤¸¤ç¤¦ /Å컳»°¾ò/ @@ -147046,7 +147054,7 @@ zyklus / ¤Ò¤¯¤¤¤É¤ê /²Ð¶ôÄ»/ ¤Ò¤¯¤¤¤Ê /Èì¿å·Ü/Èìã¿·Ü/ ¤Ò¤¯¤¦ /Èó¶õ/ -¤Ò¤¯¤¦¤Æ¤¤ /Èô¶õÄò/Èô¶õÄú/ +¤Ò¤¯¤¦¤Æ¤¤ /Èô¶õÄú/ ¤Ò¤¯¤¦¤Ï¤¯¤â¤¸ /Èó¶õÇòʸ»ú/ ¤Ò¤¯¤Ä /Èܶþ/ ¤Ò¤¯¤Æ /°ú¤¯¼ê/ @@ -148446,6 +148454,7 @@ zyklus / ¤Ò¤Ð /ÈæÇÌ/ ¤Ò¤Ð¤¤ /ÈîÇÝ/ÈóÇä/ ¤Ò¤Ð¤¤¤Ò¤ó /ÈóÇäÉÊ/ +¤Ò¤Ð¤«¤Þ /Èì¸Ó/ ¤Ò¤Ð¤«¤ê /Æü·×/ ¤Ò¤Ð¤¯ /ÈïÇú;¢÷Çúȯ¤Ë¤¢¤¦/ÈïÇø;¢÷Êü¼ÍÀþ¤Ë¤µ¤é¤µ¤ì¤ë/ÈôßÆ;¹â¤¤Âì/ÈïÇû/ ¤Ò¤Ð¤¯¤·¤ã /ÈïÇú¼Ô;¢÷¡Ö¸¶Çú-¡×/ÈïÇø¼Ô;¢÷¡ÖÊü¼Íǽϳ¤ì¤Î-¡×/ @@ -149487,6 +149496,7 @@ zyklus / ¤Ò¤ì¤¤¤Ü¤¦¤·¤ã /ÈóÎä˼¼Ö/ ¤Ò¤ì¤­ /ÈäßÍ/Èôãª/ ¤Ò¤ì¤Ä /ÈÜÎô/ +¤Ò¤ì¤Ä¤«¤ó /ÈÜÎô´Á/ ¤Ò¤ì¤Ë¤¯ /¥Ò¥ìÆù/ ¤Ò¤ì¤ó /ÈáÎø/ ¤Ò¤ì¤ó¤±¤Ä /ÈóÏ¢·ë/ @@ -150943,6 +150953,7 @@ zyklus / ¤Õ¤¯¤®¤Á¤ç¤¦ /ÉûµÄĹ/ ¤Õ¤¯¤®¤ç¤¦ /Éû¶È/ ¤Õ¤¯¤¯¤¦ /Ê¢¹Ð/ +¤Õ¤¯¤¯¤¦¤­¤ç¤¦ /Ê¢¹Ð¶À/ ¤Õ¤¯¤¯¤Ã¤»¤Ä /Ê£¶þÀÞ/ ¤Õ¤¯¤¯¤ß¤¢¤¤¤Á¤ç¤¦ /ÉûÁȹçĹ/ ¤Õ¤¯¤±¤¤ /Éü·¼/ @@ -151264,6 +151275,7 @@ zyklus / ¤Õ¤¯¤È¤¯ /Ê¡ÆÁ/ ¤Õ¤¯¤È¤¯¤¨¤ó¤Þ¤ó /Ê¡ÆÁ±ßËþ/ ¤Õ¤¯¤È¤·¤ó /ÉûÅÔ¿´/ +¤Õ¤¯¤È¤·¤ó¤»¤ó /ÉûÅÔ¿´Àþ/ ¤Õ¤¯¤È¤ß /Ê¡ÉÙ/ ¤Õ¤¯¤È¤á /ʡα/ ¤Õ¤¯¤É /ʤÅÚ/ @@ -154798,7 +154810,7 @@ zyklus / ¤Ø¤¤¤¹¤¦ /ʼ¿ô/ ¤Ø¤¤¤¹¤± /Ê¿½õ/Ê¿Í´/ ¤Ø¤¤¤»¤¤ /Ê¿À®;ǯ¹æ(1989-)/Ê¿ÀÅ/ʼÀ©/ʾÀ©/ÊÀÀ¯/ -¤Ø¤¤¤»¤¤#¤Í¤ó /Ê¿À®#0ǯ/Ê¿À®#1ǯ/Ê¿À®#2ǯ/Ê¿À®#3ǯ/(skk-gengo-to-ad "" "ǯ")/(skk-gengo-to-ad "À¾Îñ" "ǯ")/ +¤Ø¤¤¤»¤¤#¤Í¤ó /Ê¿À®#0ǯ/Ê¿À®#1ǯ/Ê¿À®#2ǯ/Ê¿À®#3ǯ/ ¤Ø¤¤¤»¤¤#¤Í¤ó¤É /Ê¿À®#0ǯÅÙ/ ¤Ø¤¤¤»¤¤¤¤¤·¤ó /Ê¿À®°Ý¿·/ ¤Ø¤¤¤»¤¤¤¬¤ó¤Í¤ó /Ê¿À®¸µÇ¯/ @@ -159542,6 +159554,7 @@ zyklus / ¤Þ¤­¤ç¤¦¤Ç¤ó¤»¤Ä /ËⶭÅÁÀâ/ ¤Þ¤­¤ï¤ê /¿Å³ä¤ê/ ¤Þ¤® /´ÖÌÚ/ +¤Þ¤®¤ã¤¯ /¿¿µÕ/ ¤Þ¤®¤ç¤¦ /¥Þ¹Ô/¤Þ¹Ô/ ¤Þ¤®¤é /ʶ¤é/ ¤Þ¤®¤é¤ï¤· /ʶ¤é¤ï¤·/ @@ -159936,6 +159949,7 @@ zyklus / ¤Þ¤Á¤¬¤¤¤µ¤¬¤· /´Ö°ã¤¤Ãµ¤·/ ¤Þ¤Á¤¬¤¤¤Ç¤ó¤ï /´Ö°ã¤¤ÅÅÏÃ/ ¤Þ¤Á¤¬¤¨ /´Ö°ã¤¨/ +¤Þ¤Á¤® /³¹Ãå/Ä®Ãå/ ¤Þ¤Á¤®¤ç¤¦¤ì¤Ä /ÂÔ¤Á¹ÔÎó/ÂÔ¹ÔÎó/ ¤Þ¤Á¤¯ /ËãÃÝ/ ¤Þ¤Á¤³ /¿¿ÃλÒ/Ä®»Ò/ËþÃÒ»Ò/ËãÃλÒ/âÃÃÒ»Ò/³¹»Ò/ËáÃÒ»Ò/ @@ -161081,7 +161095,7 @@ zyklus / ¤ß¤«¤ï¤»¤ó /»°²ÏÀþ/ ¤ß¤«¤ï¤¿¤Ï¤é¤¨¤­ /»°²ÏÅĸ¶±Ø/ ¤ß¤«¤ï¤Á¤Û¤¦ /»°²ÏÃÏÊý/ -¤ß¤«¤ï¤Á¤ä¤­ /»°²ÏÆâ¾Æ/ +¤ß¤«¤ï¤Á¤ä¤­ /»°ÀîÆâ¾Æ/ ¤ß¤«¤ï¤Ù¤ó /»°²ÏÊÛ/ ¤ß¤«¤ï¤â¤Î /»°²Ï¼Ô/ ¤ß¤«¤ï¤â¤Î¤¬¤¿¤ê /»°²Ïʪ¸ì/ @@ -162913,6 +162927,7 @@ zyklus / ¤ß¤ï¤¯¤Æ¤­ /Ì¥ÏÇŪ/ ¤ß¤ï¤± /¸«Ê¬¤±/¸«Ê¬/ ¤ß¤ï¤³ /ÈþÏ»Ò/ +¤ß¤ï¤¶ /¸æ¶È/ ¤ß¤ï¤¹¤ì /¸«Ëº¤ì/ ¤ß¤ï¤¿ /»°ÎØÅÄ/ ¤ß¤ï¤À /»°ÎØÅÄ/ @@ -164347,7 +164362,7 @@ zyklus / ¤á¤¤¤·¤ó¤« /Ì¿®²È/ ¤á¤¤¤·¤ó¤³¤¦¤½¤¯ /̾¿À¹â®/ ¤á¤¤¤¸ /ÌÀ¼£;ǯ¹æ(1868-1912)/ÌÀ¼¨;specify/̾¼­;term/ -¤á¤¤¤¸#¤Í¤ó /ÌÀ¼£#0ǯ/ÌÀ¼£#1ǯ/ÌÀ¼£#2ǯ/ÌÀ¼£#3ǯ/(skk-gengo-to-ad "" "ǯ")/(skk-gengo-to-ad "À¾Îñ" "ǯ")/ +¤á¤¤¤¸#¤Í¤ó /ÌÀ¼£#0ǯ/ÌÀ¼£#1ǯ/ÌÀ¼£#2ǯ/ÌÀ¼£#3ǯ/ ¤á¤¤¤¸¤¤¤³¤¦ /ÌÀ¼£°Ê¹ß/ ¤á¤¤¤¸¤¤¤´ /ÌÀ¼£°Ê¸å/ ¤á¤¤¤¸¤¤¤·¤ó /ÌÀ¼£°Ý¿·/ @@ -164479,7 +164494,7 @@ zyklus / ¤á¤¤¤Ð¤ó /̾È×/ ¤á¤¤¤Ò¤Ä /̾ɮ/ ¤á¤¤¤Ò¤ç¤¦ /̾ɼ/ -¤á¤¤¤Ò¤ó /̾ÉÊ/̾ÌÆ/ +¤á¤¤¤Ò¤ó /̾ÉÊ/̾ÌÆ/ÌÃÉÊ/ ¤á¤¤¤Ó /ÌÀÕ»/ ¤á¤¤¤Ó¤å¤¦ /ÌÂɵ/ ¤á¤¤¤Ó¤ó /ÌÀÉÒ/ @@ -167076,7 +167091,7 @@ zyklus / ¤ä¤Ä¤Ï¤·¤±¤ó¤®¤ç¤¦ /Ȭ¶¶¸¡¹»;(1614-1685) ䷶ʲȡ£¡ØÏ»ÃʤÎÄ´¤Ù¡Ù/ ¤ä¤Ä¤Ð¤é /ÅÛ¸¶/ ¤ä¤Ä¤á /Ȭ¤ÄÌÜ/ -¤ä¤Ä¤á¤¦¤Ê¤® /ȬÌܱ·/òç/ +¤ä¤Ä¤á¤¦¤Ê¤® /ȬÌܱ·/ ¤ä¤Ä¤â¤ê /Ȭ¥Ã¿¹/ ¤ä¤Ä¤æ¤¦¤¨¤ó /ëÄÅÍ·±à/ ¤ä¤Ä¤é /ÅÛÅù/ÅÛ¤é/ @@ -169410,7 +169425,7 @@ zyklus / ¤è¤¦¤Ç¤ó¤· /ÍÛÅÅ»Ò/ ¤è¤¦¤Ç¤ó¤·¤º¤Î¤¦ /ÍÛÅÅ»ÒƬǾ/ ¤è¤¦¤È /ÍÑÅÓ/ -¤è¤¦¤È¤¦ /ÍÓƬ/ÍÎÅõ;°ÛÂλú/ÍÎÅô;lamp/ÍÎÅç/ +¤è¤¦¤È¤¦ /ÍÓƬ/ÍÎÅõ;°ÛÂλú/ÍÎÅô;lamp/ÍÎÅç/ÍÅÅá/ ¤è¤¦¤È¤¦¤¯¤Ë¤¯ /ÍÓƬ¶éÆù/ ¤è¤¦¤È¤·¤Æ /Úâ¤È¤·¤Æ/ ¤è¤¦¤È¤¸ /ÍÎÄÖ¤¸/ @@ -170576,7 +170591,7 @@ zyklus / ¤è¤â¤¹¤¬¤é /½ªÌë/ ¤è¤â¤Ä /²«Àô¤Ä;¡Ö¤Ä¡×¤Ï¡Ö¤Î¡×¤Î°Õ¤Î³Ê½õ»ì/ ¤è¤â¤Ä¤¯¤Ë /²«Àô¹ñ/ -¤è¤â¤Ä¤Ò¤é¤µ¤« /²«ÀôÊ¿ºä/ +¤è¤â¤Ä¤Ò¤é¤µ¤« /²«ÀôÊ¿ºä/²«ÀôÈæÎɺä;¸Å»öµ­/ÀôÄÅÊ¿ºä;ÆüËܽñµª/ ¤è¤â¤ä¤Þ /»ÍÊý»³/ ¤è¤â¤ä¤Þ¤Ð¤Ê¤· /»ÍÊý»³ÏÃ/ ¤è¤ä¤¯ /ͽÌó/ЮÌó;¡Öͽ¡×µì»ú/ @@ -173618,7 +173633,8 @@ zyklus / ¤ì¤¤¤ê¤ç¤¦ /ÎäÎÃ/ ¤ì¤¤¤ê¤ç¤¯ /ÎîÎÏ/ ¤ì¤¤¤í¤¦ /Îèàü/ -¤ì¤¤¤ï /ÎãÏÃ/ +¤ì¤¤¤ï /ÎáÏÂ;ǯ¹æ(2019-)/ÎãÏÃ/ +¤ì¤¤¤ï#¤Í¤ó /ÎáÏÂ#0ǯ/ÎáÏÂ#1ǯ/ÎáÏÂ#2ǯ/ÎáÏÂ#3ǯ/ ¤ì¤ª¤Ê /Îè±÷Æà/Îè±û̾/ ¤ì¤­ /Îò;¢÷history/Îñ;¢÷calendar/ãª;¾®ÀÐ/íà;-»à/ݬ;¥¯¥Ì¥®/ßÍ;pitch/Ý®;¥¯¥Ì¥®/áü;áðáü/íá/ðÎ;(ÀÄÅ·¤Î)ðÈðÎ/ò¯;Ť/ ¤ì¤­¤¬¤ó /㪴ä/ commit 6ae0a50bc881e7b710a828ac89b5d1f834edac85 Author: Paul Eggert Date: Mon Apr 29 12:27:04 2019 -0700 Disable __attribute__ ((cold)) on MinGW * src/conf_post.h (ATTRIBUTE_COLD) [__MINGW32__]: Define to empty on this platform. diff --git a/src/conf_post.h b/src/conf_post.h index 7699d2c95b..4af1ba9331 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -59,7 +59,7 @@ along with GNU Emacs. If not, see . */ into the same 1-, 2-, or 4-byte allocation unit in the MinGW builds. It was also needed to port to pre-C99 compilers, although we don't care about that any more. */ -#if NS_IMPL_GNUSTEP || defined(__MINGW32__) +#if NS_IMPL_GNUSTEP || defined __MINGW32__ typedef unsigned int bool_bf; #else typedef bool bool_bf; @@ -225,7 +225,9 @@ extern void _DebPrint (const char *fmt, ...); extern char *emacs_getenv_TZ (void); extern int emacs_setenv_TZ (char const *); -#if __has_attribute (cold) +/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at + . */ +#if __has_attribute (cold) && !defined __MINGW32__ # define ATTRIBUTE_COLD __attribute__ ((cold)) #else # define ATTRIBUTE_COLD commit 7c7ee1dd52239ecc3665b7542bd5e0ebc9b74795 Merge: 3a903f09a1 c26d452ae1 Author: Glenn Morris Date: Mon Apr 29 09:12:53 2019 -0700 Merge from origin/emacs-26 c26d452 (origin/emacs-26) * src/macfont.m (macfont_shape): Use conven... 140e7f8 Recommend using font-lock-face over face (Bug#35044) 7cb5364 Check if mouse_face_overlay was deleted (Bug#35273) # Conflicts: # src/macfont.m commit 3a903f09a10fc506df8bd0f0242856c7595c8e7d Merge: 6662938619 531c74e249 Author: Glenn Morris Date: Mon Apr 29 09:08:19 2019 -0700 ; Merge from origin/emacs-26 The following commit was skipped: 531c74e Port to platforms where tputs is in libtinfow commit 666293861985480bc658f9fa399009027bc39f1e Merge: f1a3a7d6ca 0e8d452c1c Author: Glenn Morris Date: Mon Apr 29 09:08:19 2019 -0700 Merge from origin/emacs-26 0e8d452 ; * doc/lispref/nonascii.texi (Coding System Basics): Fix gra... 25a2ff7 ; Add missing space in custom.texi 9ec18fb * admin/admin.el (set-version): Check for increase in version... 93912ba Be more careful about indent-sexp going over eol (Bug#35286) commit f1a3a7d6caeb3f250d338217dfd4c476e812bc6e Merge: 82ba72ad7a 3988e93d4b Author: Glenn Morris Date: Mon Apr 29 09:08:18 2019 -0700 ; Merge from origin/emacs-26 The following commits were skipped: 3988e93 Backport: Improve pure and side-effect-free docs 7565d2d Backport: Avoid using obsolete indent-relative-maybe commit 82ba72ad7a4121524ee989cde09d61dab6b34dbc Author: Paul Eggert Date: Mon Apr 29 08:39:34 2019 -0700 Replace ‘/* FALLTHROUGH! */’ with ‘break;’ * src/data.c (set_internal, set_default_internal): Replace obsolescent /* FALLTHROUGH! */ comments with ‘break;’, as ‘FALLTHROUGH;’ is not needed here. diff --git a/src/data.c b/src/data.c index 7928a1dc41..476d28eadb 100644 --- a/src/data.c +++ b/src/data.c @@ -1301,15 +1301,13 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, enum Set_Internal_Bind bindflag) { bool voide = EQ (newval, Qunbound); - struct Lisp_Symbol *sym; - Lisp_Object tem1; /* If restoring in a dead buffer, do nothing. */ /* if (BUFFERP (where) && NILP (XBUFFER (where)->name)) return; */ CHECK_SYMBOL (symbol); - sym = XSYMBOL (symbol); + struct Lisp_Symbol *sym = XSYMBOL (symbol); switch (sym->u.s.trapped_write) { case SYMBOL_NOWRITE: @@ -1328,9 +1326,10 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, bindflag == SET_INTERNAL_UNBIND? Qunlet : voide? Qmakunbound : Qset), where); - /* FALLTHROUGH! */ + break; + case SYMBOL_UNTRAPPED_WRITE: - break; + break; default: emacs_abort (); } @@ -1363,8 +1362,9 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, /* Find the new binding. */ XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ - tem1 = assq_no_quit (symbol, - BVAR (XBUFFER (where), local_var_alist)); + Lisp_Object tem1 + = assq_no_quit (symbol, + BVAR (XBUFFER (where), local_var_alist)); set_blv_where (blv, where); blv->found = true; @@ -1649,10 +1649,8 @@ void set_default_internal (Lisp_Object symbol, Lisp_Object value, enum Set_Internal_Bind bindflag) { - struct Lisp_Symbol *sym; - CHECK_SYMBOL (symbol); - sym = XSYMBOL (symbol); + struct Lisp_Symbol *sym = XSYMBOL (symbol); switch (sym->u.s.trapped_write) { case SYMBOL_NOWRITE: @@ -1669,9 +1667,10 @@ set_default_internal (Lisp_Object symbol, Lisp_Object value, /* Setting due to thread switching doesn't count. */ && bindflag != SET_INTERNAL_THREAD_SWITCH) notify_variable_watchers (symbol, value, Qset_default, Qnil); - /* FALLTHROUGH! */ + break; + case SYMBOL_UNTRAPPED_WRITE: - break; + break; default: emacs_abort (); } commit 295c79750341df94e894a95ce51401f989fc7f48 Author: Michael Albinus Date: Mon Apr 29 17:24:53 2019 +0200 * test/lisp/net/tramp-tests.el (tramp--test-timeout-handler): Instrument. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 4495a1fce4..cba697da18 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3846,6 +3846,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (defun tramp--test-timeout-handler (&rest _ignore) "Timeout handler, reporting a failed test." (interactive) + (let ((proc (get-buffer-process (current-buffer)))) + (when (processp proc) + (tramp--test-message + "cmd: %s\n%s" (process-command proc) (buffer-string)))) (ert-fail (format "`%s' timed out" (ert-test-name (ert-running-test))))) (ert-deftest tramp-test29-start-file-process () commit 3c513f3f62b1b4b425cdbabcbb8cc72c49478e6a Author: Eli Zaretskii Date: Mon Apr 29 18:18:51 2019 +0300 Avoid compilation warnings in w32.c * src/w32.c (unsetenv, readlink): Use memcpy instead of strncpy, to avoid a compiler warning about calculating the bound of the copy. diff --git a/src/w32.c b/src/w32.c index 082a66b738..677c37fcb5 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2644,7 +2644,7 @@ unsetenv (const char *name) /* It is safe to use 'alloca' with 32K size, since the stack is at least 2MB, and we set it to 8MB in the link command line. */ var = alloca (name_len + 2); - strncpy (var, name, name_len); + memcpy (var, name, name_len); var[name_len++] = '='; var[name_len] = '\0'; return _putenv (var); @@ -6054,7 +6054,7 @@ readlink (const char *name, char *buf, size_t buf_size) lname_size = strlen (resolved) + 1; if (lname_size <= buf_size) size_to_copy = lname_size; - strncpy (buf, resolved, size_to_copy); + memcpy (buf, resolved, size_to_copy); /* Success! */ retval = size_to_copy; } commit c26d452ae15a74f0eeec53ba529eebaa95eb5489 (refs/remotes/origin/emacs-26) Author: YAMAMOTO Mitsuharu Date: Mon Apr 29 07:31:45 2019 +0900 * src/macfont.m (macfont_shape): Use convenient LGLYPH_NEW. diff --git a/src/macfont.m b/src/macfont.m index 42ebfd3d6b..7f153e1304 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -2994,7 +2994,7 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no if (NILP (lglyph)) { - lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); + lglyph = LGLYPH_NEW (); LGSTRING_SET_GLYPH (lgstring, i, lglyph); } commit 140e7f890fa94f8b6381dfa3e0682cacfa92a593 Author: Noam Postavsky Date: Fri Apr 19 00:55:14 2019 -0400 Recommend using font-lock-face over face (Bug#35044) * doc/lispref/modes.texi (Precalculated Fontification): Explain advantages of using font-lock-face over face. diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 919816f3de..0ff13d72e2 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -3201,7 +3201,12 @@ is disabled, @code{font-lock-face} has no effect on the display. It is ok for a mode to use @code{font-lock-face} for some text and also use the normal Font Lock machinery. But if the mode does not use the normal Font Lock machinery, it should not set the variable -@code{font-lock-defaults}. +@code{font-lock-defaults}. In this case the @code{face} property will +not be overriden, so using the @code{face} property could work too. +However, using @code{font-lock-face} is generally preferable as it +allows the user to control the fontification by toggling +@code{font-lock-mode}, and lets the code work regardless of whether +the mode uses Font Lock machinery or not. @node Faces for Font Lock @subsection Faces for Font Lock commit 7cb5364ef5334de0fb1bc2e470bea450e4567d24 Author: Noam Postavsky Date: Sat Apr 27 15:22:11 2019 -0400 Check if mouse_face_overlay was deleted (Bug#35273) * src/xdisp.c (note_mouse_highlight): Check if the mouse_face_overlay actually points to a buffer, before calling mouse_face_overlay_overlaps on it. diff --git a/src/xdisp.c b/src/xdisp.c index 0c3754a338..aa6e1bd2df 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -31526,7 +31526,9 @@ note_mouse_highlight (struct frame *f, int x, int y) is currently hidden to avoid Bug#30519. */ || (!hlinfo->mouse_face_hidden && OVERLAYP (hlinfo->mouse_face_overlay) - && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay))) + /* It's possible the overlay was deleted (Bug#35273). */ + && XMARKER (OVERLAY_START (hlinfo->mouse_face_overlay))->buffer + && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay))) { /* Find the highest priority overlay with a mouse-face. */ Lisp_Object overlay = Qnil; commit 531c74e2493cf54dc76238930bb93c6d7112ed3b Author: Paul Eggert Date: Sat Jan 5 09:47:14 2019 -0800 Port to platforms where tputs is in libtinfow * configure.ac (tputs_library): Also try tinfow, ncursesw (Bug#33977). (cherry picked from commit a3d52b3057c98bce581bc94912ef3ced6fad6f14) diff --git a/configure.ac b/configure.ac index cf3fbd9d50..58a3ea1091 100644 --- a/configure.ac +++ b/configure.ac @@ -4046,7 +4046,8 @@ AC_CACHE_CHECK([for library containing tputs], [emacs_cv_tputs_lib], emacs_cv_tputs_lib='none required' else # curses precedes termcap because of AIX (Bug#9736#35) and OpenIndiana. - for tputs_library in '' tinfo ncurses terminfo curses termcap; do + tputs_libraries='tinfo ncurses terminfo curses termcap tinfow ncursesw' + for tputs_library in '' $tputs_libraries; do OLIBS=$LIBS if test -z "$tputs_library"; then emacs_cv_tputs_lib='none required' commit 0e8d452c1c166ff65a0325de23bc04b57aea68d8 Author: Charles A. Roelli Date: Fri Apr 26 21:49:46 2019 +0200 ; * doc/lispref/nonascii.texi (Coding System Basics): Fix grammar. diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index d58041b279..df4f2932c6 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1049,7 +1049,7 @@ is like @code{undecided}, but it prefers to choose @code{utf-8} when possible. In general, a coding system doesn't guarantee roundtrip identity: -decoding a byte sequence using coding system, then encoding the +decoding a byte sequence using a coding system, then encoding the resulting text in the same coding system, can produce a different byte sequence. But some coding systems do guarantee that the byte sequence will be the same as what you originally decoded. Here are a few commit 25a2ff72d09dfedc3803984cd1744c982de1c709 Author: Michael Albinus Date: Thu Apr 25 22:49:03 2019 +0200 ; Add missing space in custom.texi diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 3f660fe9a2..b07362f3ce 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1329,7 +1329,7 @@ On MS-DOS, the name of this file should be @file{_dir-locals.el}, due to limitations of the DOS filesystems. If the filesystem is limited to 8+3 file names, the name of the file will be truncated by the OS to @file{_dir-loc.el}. -}in a directory. Whenever Emacs visits any file in that directory or +} in a directory. Whenever Emacs visits any file in that directory or any of its subdirectories, it will apply the directory-local variables specified in @file{.dir-locals.el}, as though they had been defined as file-local variables for that file (@pxref{File Variables}). Emacs commit 9ec18fbd560526ab19c6171aff15995d1307233e Author: Glenn Morris Date: Mon Apr 22 21:24:22 2019 -0400 * admin/admin.el (set-version): Check for increase in version length, rather than a .50 version. diff --git a/admin/admin.el b/admin/admin.el index fda6708d4c..d7de42e078 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -138,10 +138,10 @@ Root must be the root of an Emacs source tree." (if (eq 2 (length newversion)) 0 1)))) (majorbump (and oldversion (not (equal oldmajor newmajor)))) (minorbump (and oldversion (not majorbump) - (or (not (equal (cadr oldversion) - (cadr newversion))) - (and (equal (cadr oldversion) (cadr newversion)) - (equal (nth 2 newversion) 50))))) + (or (not (equal (cadr oldversion) (cadr newversion))) + ;; Eg 26.2 -> 26.2.50. + (and (> (length newversion) + (length oldversion)))))) (newsfile (expand-file-name "etc/NEWS" root)) (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) (unless (> (length newversion) 2) ; pretest or release candidate? commit 93912baefd10ccb3e6e2e9696cda3b813c056c87 Author: Noam Postavsky Date: Mon Apr 15 18:49:57 2019 -0400 Be more careful about indent-sexp going over eol (Bug#35286) * lisp/emacs-lisp/lisp-mode.el (indent-sexp): Only go over multiple sexps if the end of line is within a sexp. * test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-stop-before-eol-comment) (indent-sexp-stop-before-eol-non-lisp): New tests. diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 57f57175c5..74bf0c87c5 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1205,19 +1205,25 @@ ENDPOS is encountered." ;; Get error now if we don't have a complete sexp ;; after point. (save-excursion + (forward-sexp 1) (let ((eol (line-end-position))) - (forward-sexp 1) ;; We actually look for a sexp which ends ;; after the current line so that we properly ;; indent things like #s(...). This might not ;; be needed if Bug#15998 is fixed. - (condition-case () - (while (and (< (point) eol) (not (eobp))) - (forward-sexp 1)) - ;; But don't signal an error for incomplete - ;; sexps following the first complete sexp - ;; after point. - (scan-error nil))) + (when (and (< (point) eol) + ;; Check if eol is within a sexp. + (> (nth 0 (save-excursion + (parse-partial-sexp + (point) eol))) + 0)) + (condition-case () + (while (< (point) eol) + (forward-sexp 1)) + ;; But don't signal an error for incomplete + ;; sexps following the first complete sexp + ;; after point. + (scan-error nil)))) (point))))) (save-excursion (while (let ((indent (lisp-indent-calc-next parse-state)) diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el index a6370742ab..63632449ca 100644 --- a/test/lisp/emacs-lisp/lisp-mode-tests.el +++ b/test/lisp/emacs-lisp/lisp-mode-tests.el @@ -136,6 +136,34 @@ noindent\" 3 (indent-sexp) (should (equal (buffer-string) "(())")))) +(ert-deftest indent-sexp-stop-before-eol-comment () + "`indent-sexp' shouldn't look for more sexps after an eol comment." + ;; See https://debbugs.gnu.org/35286. + (with-temp-buffer + (emacs-lisp-mode) + (let ((str "() ;;\n x")) + (insert str) + (goto-char (point-min)) + (indent-sexp) + ;; The "x" is in the next sexp, so it shouldn't get indented. + (should (equal (buffer-string) str))))) + +(ert-deftest indent-sexp-stop-before-eol-non-lisp () + "`indent-sexp' shouldn't be too agressive in non-Lisp modes." + ;; See https://debbugs.gnu.org/35286#13. + (with-temp-buffer + (prolog-mode) + (let ((str "\ +x(H) --> + {y(H)}. +a(A) --> + b(A).")) + (insert str) + (search-backward "{") + (indent-sexp) + ;; There's no line-spanning sexp, so nothing should be indented. + (should (equal (buffer-string) str))))) + (ert-deftest lisp-indent-region () "Test basics of `lisp-indent-region'." (with-temp-buffer commit 3988e93d4b0f2bf677efd9f560373dd526097609 Author: Basil L. Contovounesios Date: Wed Apr 17 16:34:47 2019 +0100 Backport: Improve pure and side-effect-free docs For discussion, see thread starting at: https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00316.html * doc/lispref/customize.texi (Composite Types): Do not overspecify :match-alternatives predicates. * doc/lispref/eval.texi (Intro Eval): Anchor definition of "side effect" for cross-referencing... * doc/lispref/functions.texi (What Is a Function): ...from here. Define what a pure function is. * doc/lispref/internals.texi (Writing Emacs Primitives): Describe currently preferred approach to marking primitives as pure and side-effect-free. * doc/lispref/symbols.texi (Standard Properties): Expand description of pure and side-effect-free properties. (cherry picked from commit 4430a9b54fca266e48d0eb8b72d83706910f10b8) diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index f71dedfd8b..02eefe0f58 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi @@ -950,10 +950,10 @@ possibilities: @itemize @bullet @item -A predicate---that is, a function of one argument that has no side -effects, and returns either @code{nil} or non-@code{nil} according to -the argument. Using a predicate in the list says that objects for which -the predicate returns non-@code{nil} are acceptable. +A predicate---that is, a function of one argument that returns either +@code{nil} or non-@code{nil} according to the argument. Using a +predicate in the list says that objects for which the predicate +returns non-@code{nil} are acceptable. @item A quoted constant---that is, @code{'@var{object}}. This sort of element diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index 4bf70d247b..73f5396dab 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -86,6 +86,7 @@ also temporarily alter the environment by binding variables (@pxref{Local Variables}). @cindex side effect +@anchor{Definition of side effect} Evaluating a form may also make changes that persist; these changes are called @dfn{side effects}. An example of a form that produces a side effect is @code{(setq foo 1)}. diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index d01804e494..f641fe7024 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -38,11 +38,16 @@ define them. @cindex return value @cindex value of function @cindex argument +@cindex pure function In a general sense, a function is a rule for carrying out a computation given input values called @dfn{arguments}. The result of the computation is called the @dfn{value} or @dfn{return value} of the function. The computation can also have side effects, such as lasting -changes in the values of variables or the contents of data structures. +changes in the values of variables or the contents of data structures +(@pxref{Definition of side effect}). A @dfn{pure function} is a +function which, in addition to having no side effects, always returns +the same value for the same combination of arguments, regardless of +external factors such as machine type or system state. In most computer languages, every function has a name. But in Lisp, a function in the strictest sense has no name: it is an object which diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 38d84f149e..62a102e384 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -976,10 +976,9 @@ number of arguments. They work by calling @code{Ffuncall}. @file{lisp.h} contains the definitions for some important macros and functions. - If you define a function which is side-effect free, update the code -in @file{byte-opt.el} that binds @code{side-effect-free-fns} and -@code{side-effect-and-error-free-fns} so that the compiler optimizer -knows about it. + If you define a function which is side-effect free or pure, give it +a non-@code{nil} @code{side-effect-free} or @code{pure} property, +respectively (@pxref{Standard Properties}). @node Writing Dynamic Modules @section Writing Dynamically-Loaded Modules diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index a214a2d3fd..5d71fb39a2 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -558,9 +558,12 @@ deleted from the local value of a hook variable when changing major modes. @xref{Setting Hooks}. @item pure +@cindex @code{pure} property If the value is non-@code{nil}, the named function is considered to be -side-effect free. Calls with constant arguments can be evaluated at -compile time. This may shift run time errors to compile time. +pure (@pxref{What Is a Function}). Calls with constant arguments can +be evaluated at compile time. This may shift run time errors to +compile time. Not to be confused with pure storage (@pxref{Pure +Storage}). @item risky-local-variable If the value is non-@code{nil}, the named variable is considered risky @@ -579,9 +582,13 @@ The value specifies a function for determining safe file-local values for the named variable. @xref{File Local Variables}. @item side-effect-free +@cindex @code{side-effect-free} property A non-@code{nil} value indicates that the named function is free of -side-effects, for determining function safety (@pxref{Function -Safety}) as well as for byte compiler optimizations. Do not set it. +side effects (@pxref{What Is a Function}), so the byte compiler may +ignore a call whose value is unused. If the property's value is +@code{error-free}, the byte compiler may even delete such unused +calls. In addition to byte compiler optimizations, this property is +also used for determining function safety (@pxref{Function Safety}). @item variable-documentation If non-@code{nil}, this specifies the named variable's documentation commit 7565d2d2fbc8eec314d40e2e99992c8864307e1b Author: Basil L. Contovounesios Date: Tue Apr 2 00:56:04 2019 +0100 Backport: Avoid using obsolete indent-relative-maybe * lisp/electric.el (electric-indent-functions-without-reindent): * lisp/indent.el (indent-according-to-mode): Check for indent-relative-first-indent-point in addition to its obsolete alias indent-relative-maybe. * lisp/obsolete/vi.el (vi-com-map): Use indent-relative-first-indent-point in place of its obsolete alias indent-relative-maybe. (cherry picked from commit 0e468a620458fecd003c396050aa6deb722982c1) diff --git a/lisp/electric.el b/lisp/electric.el index 3fc1fbbbca..a30090d1d8 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -223,9 +223,9 @@ Python does not lend itself to fully automatic indentation.") (defvar electric-indent-functions-without-reindent '(indent-relative indent-to-left-margin indent-relative-maybe - py-indent-line coffee-indent-line org-indent-line yaml-indent-line - haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent - yaml-indent-line) + indent-relative-first-indent-point py-indent-line coffee-indent-line + org-indent-line yaml-indent-line haskell-indentation-indent-line + haskell-indent-cycle haskell-simple-indent yaml-indent-line) "List of indent functions that can't reindent. If `indent-line-function' is one of those, then `electric-indent-mode' will not try to reindent lines. It is normally better to make the major diff --git a/lisp/indent.el b/lisp/indent.el index 8a0f837865..da58a420fe 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -65,15 +65,17 @@ e.g., `c-tab-always-indent', and do not respect this variable." "Indent line in proper way for current major mode. Normally, this is done by calling the function specified by the variable `indent-line-function'. However, if the value of that -variable is `indent-relative' or `indent-relative-maybe', handle -it specially (since those functions are used for tabbing); in -that case, indent by aligning to the previous non-blank line." +variable is `indent-relative' or `indent-relative-first-indent-point', +handle it specially (since those functions are used for tabbing); +in that case, indent by aligning to the previous non-blank line." (interactive) (save-restriction (widen) (syntax-propertize (line-end-position)) (if (memq indent-line-function - '(indent-relative indent-relative-maybe)) + '(indent-relative + indent-relative-maybe + indent-relative-first-indent-point)) ;; These functions are used for tabbing, but can't be used for ;; indenting. Replace with something ad-hoc. (let ((column (save-excursion diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el index a7a98d0ca5..aee4f18768 100644 --- a/lisp/obsolete/vi.el +++ b/lisp/obsolete/vi.el @@ -132,7 +132,7 @@ command extensions.") (define-key vi-com-map "\C-e" 'vi-expose-line-below) (define-key vi-com-map "\C-f" 'vi-forward-windowful) (define-key vi-com-map "\C-g" 'keyboard-quit) - (define-key vi-com-map "\C-i" 'indent-relative-maybe) ; TAB + (define-key vi-com-map "\C-i" 'indent-relative-first-indent-point) ; TAB (define-key vi-com-map "\C-j" 'vi-next-line) ; LFD (define-key vi-com-map "\C-k" 'vi-kill-line) ; extension (define-key vi-com-map "\C-l" 'recenter)